Skip to content

Commit 7bb0c88

Browse files
TheSonOfThompTheSonOfThomp
committed
Squashed commit of the following:
commit cb03690 Merge: f201865 dbf5b75 Author: Adam Michael Thompson <[email protected]> Date: Wed Dec 3 14:26:43 2025 -0500 Merge branch 'main' into at/wizard-integration commit f201865 Merge: 814af43 7a1b203 Author: Adam Michael Thompson <[email protected]> Date: Wed Dec 3 14:26:14 2025 -0500 Merge branch 'at/wizard-integration' of https://github.com/mongodb/leafygreen-ui into at/wizard-integration commit 814af43 Author: Adam Michael Thompson <[email protected]> Date: Wed Dec 3 14:26:03 2025 -0500 Update getTestUtils.tsx commit 7a1b203 Author: Adam Thompson <[email protected]> Date: Wed Dec 3 14:25:00 2025 -0500 Update packages/wizard/src/WizardStep/WizardStep.tsx Co-authored-by: Copilot <[email protected]> commit 83f936e Author: Adam Thompson <[email protected]> Date: Wed Dec 3 14:24:54 2025 -0500 Update packages/lib/src/childQueries/findChildren/findChildren.spec.tsx Co-authored-by: Copilot <[email protected]> commit f4a1e3d Author: Adam Thompson <[email protected]> Date: Wed Dec 3 14:24:33 2025 -0500 Update packages/lib/src/childQueries/findChild/findChild.spec.tsx Co-authored-by: Copilot <[email protected]> commit a219fae Author: Adam Thompson <[email protected]> Date: Wed Dec 3 14:24:23 2025 -0500 Update packages/wizard/src/Wizard/Wizard.tsx Co-authored-by: Copilot <[email protected]> commit dbf5b75 Author: Stephen Lee <[email protected]> Date: Wed Dec 3 10:16:56 2025 -0800 fix: publish script (#3356) commit 918b3a5 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed Dec 3 01:41:06 2025 +0000 Version Packages (#3354) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit 0c523f5 Author: Stephen Lee <[email protected]> Date: Tue Dec 2 15:12:23 2025 -0800 chore: update release pipeline (#3355) * chore: update release pipeline * refactor: update publish script commit 0c42aba Author: Adam Thompson <[email protected]> Date: Mon Dec 1 19:03:38 2025 -0500 LG-3879: fix(DatePicker) Updates DatePicker Next/Prev button aria-labels (#3224) * updates chevron button labels * update select labels * update calendar cell label * Create date-picker-aria.md * Update DatePickerMenu.spec.tsx * Update DatePicker.testutils.tsx * Update date-picker-aria.md * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Apply suggestion from @TheSonOfThomp --------- Co-authored-by: Copilot <[email protected]> commit 6e49fef Merge: c462dca 9e5932c Author: Adam Thompson <[email protected]> Date: Mon Dec 1 18:27:25 2025 -0500 Merge branch 'main' into at/wizard-integration commit 9e5932c Author: Adam Rasheed <[email protected]> Date: Mon Dec 1 13:28:47 2025 -0600 [LG-5760] chore: FormFooter Sticky Styling (#3344) * [LG-5760] chore: FormFooter Sticky Styling * updated story * updates pt1 * updated story, style cleanup * cleanup, added changeset commit fa89f65 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed Nov 26 23:12:40 2025 +0000 Version Packages (#3353) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit 837a0e7 Author: Adam Thompson <[email protected]> Date: Wed Nov 26 16:10:48 2025 -0500 Update pr.yml (#3352) commit 651c0bb Author: Nima Taheri <[email protected]> Date: Wed Nov 26 13:05:53 2025 -0800 LG-5588 Fix array field updates in chart options merge (#3351) * feat: correctly merge array-fields (choose full override, no recursive) * docs
1 parent 8fd73fa commit 7bb0c88

File tree

25 files changed

+274
-126
lines changed

25 files changed

+274
-126
lines changed

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ jobs:
221221
with:
222222
lcov-file: coverage/lcov.info
223223
delete-old-comments: true
224+
filter-changed-files: true
224225

225226
validate-builds:
226227
name: Validate builds & dependencies

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,18 @@ jobs:
196196
uses: changesets/action@v1
197197
with:
198198
version: pnpm run version # Rebuild packages to ensure any uncommitted pre-build artifacts
199-
publish: pnpm publish -r --no-git-checks # Use `pnpm publish` directly to resolve `workspace` dependencies
199+
publish: pnpm run publish
200200
createGithubReleases: true
201201
env:
202202
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
203203
NPM_TOKEN: '${{ secrets.NPM_TOKEN }}'
204204

205+
- name: Debug changesets output
206+
run: |
207+
echo "Changesets output: ${{ steps.changesets.outputs }}"
208+
echo "Changesets output type: ${{ toJSON(steps.changesets.outputs) }}"
209+
echo "--------------------------------"
210+
205211
release-aws:
206212
name: Publish to AWS CodeArtifact
207213
runs-on: ubuntu-latest

‎charts/core/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @lg-charts/core
22

3+
## 2.4.2
4+
5+
### Patch Changes
6+
7+
- 651c0bb: Ensure array fields like `labels` in `<XAxis>` are updated as expected in the chart options.
8+
This update changes the recursive merge function in the EChart options utility to treat arrays as atoms: instead of merging their elements, it now replaces arrays entirely. Previously, arrays were being merged like objects, resulting in arrays becoming plain objects with numeric keys. With this fix, when merging, any existing array field (such as `labels` on `<XAxis>`) is now overwritten by the new array rather than partially merged.
9+
310
## 2.4.1
411

512
### Patch Changes

‎charts/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@lg-charts/core",
3-
"version": "2.4.1",
3+
"version": "2.4.2",
44
"description": "lg-charts Core Chart Components",
55
"main": "./dist/umd/index.js",
66
"module": "./dist/esm/index.js",

‎charts/core/src/Echart/utils/updateUtils.spec.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,28 @@ describe('@lg-charts/core/Chart/hooks/updateUtils', () => {
5353
test('updateOptions should merge chart options non-destructively', () => {
5454
const currentOptions: Partial<EChartOptions> = {
5555
xAxis: {
56+
type: 'category',
5657
show: true,
58+
data: ['series1', 'series2', 'series3'],
5759
splitLine: {
5860
show: true,
5961
},
6062
},
6163
};
6264
const updatedOptions = updateOptions(currentOptions, {
6365
xAxis: {
66+
type: 'category',
6467
show: false, // This should only update the show property and not other properties
68+
data: ['series4', 'series5'],
6569
},
6670
grid: {
6771
show: true,
6872
},
6973
});
7074
// @ts-ignore: Property 'show' does not exist on type 'Arrayable<AriaOption>'.
7175
expect(updatedOptions?.xAxis?.show).toBe(false);
76+
// @ts-ignore: Property 'data' does not exist on type 'Arrayable<XAXisOption>'.
77+
expect(updatedOptions?.xAxis?.data).toEqual(['series4', 'series5']);
7278
// @ts-ignore: Property 'show' does not exist on type 'Arrayable<AriaOption>'.
7379
expect(updatedOptions?.xAxis?.splitLine?.show).toBe(true);
7480
// @ts-ignore: Property 'show' does not exist on type 'Arrayable<GridOption>'.

‎charts/core/src/Echart/utils/updateUtils.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { isPlainObject } from 'lodash';
2+
13
import { EChartOptions, EChartSeriesOption } from '../Echart.types';
24

35
export function addSeries(
@@ -46,10 +48,7 @@ function recursiveMerge(
4648
const updatedObj = { ...target };
4749

4850
for (const key in source) {
49-
if (
50-
typeof source[key] === 'object' &&
51-
typeof updatedObj[key] === 'object'
52-
) {
51+
if (isPlainObject(source[key]) && isPlainObject(updatedObj[key])) {
5352
// Recursively update nested objects
5453
updatedObj[key] = recursiveMerge(updatedObj[key], source[key]);
5554
} else {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"link": "lg link",
3333
"lint": "lg lint",
3434
"prepublishOnly": "pnpm run build && pnpm build:ts-downlevel && pnpm build:docs",
35-
"publish": "pnpm publish -r",
35+
"publish": "pnpm publish --recursive --no-git-checks",
3636
"reset:react17": "npx node ./scripts/react17/reset.mjs; pnpm run init",
3737
"slackbot": "lg slackbot",
3838
"start": "npx storybook dev -p 9001 --no-version-updates --no-open",

‎packages/date-picker/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @leafygreen-ui/date-picker
22

3+
## 4.1.1
4+
5+
### Patch Changes
6+
7+
- 0c42aba: [LG-3879](https://jira.mongodb.org/browse/LG-3879)
8+
Updates ARIA labels for DatePicker menu previous/next buttons, and year/month select elements.
9+
Hides calendar cell text, so screen-readers only read the cell's `aria-value`.
10+
311
## 4.1.0
412

513
### Minor Changes

‎packages/date-picker/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@leafygreen-ui/date-picker",
3-
"version": "4.1.0",
3+
"version": "4.1.1",
44
"description": "LeafyGreen UI Kit Date Picker",
55
"license": "Apache-2.0",
66
"main": "./dist/umd/index.js",

‎packages/date-picker/src/DatePicker/DatePicker.testutils.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,14 @@ export const renderDatePicker = (
114114
const calendarGrid = withinElement(menuContainerEl)?.queryByRole('grid');
115115
const calendarCells =
116116
withinElement(menuContainerEl)?.getAllByRole('gridcell');
117-
const leftChevron =
118-
withinElement(menuContainerEl)?.queryByLabelText('Previous month') ||
119-
withinElement(menuContainerEl)?.queryByLabelText('Previous valid month');
120-
const rightChevron =
121-
withinElement(menuContainerEl)?.queryByLabelText('Next month') ||
122-
withinElement(menuContainerEl)?.queryByLabelText('Next valid month');
117+
118+
// TODO: date-picker test harnesses https://jira.mongodb.org/browse/LG-4176
119+
const leftChevron = withinElement(menuContainerEl)?.queryByTestId(
120+
'lg-date_picker-menu-prev_month_button',
121+
);
122+
const rightChevron = withinElement(menuContainerEl)?.queryByTestId(
123+
'lg-date_picker-menu-next_month_button',
124+
);
123125
const monthSelect = withinElement(menuContainerEl)?.queryByLabelText(
124126
'Select month',
125127
{

0 commit comments

Comments
 (0)