Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion .github/actions/module-size-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,36 @@ inputs:
base-ref:
description: 'Base ref for nx setup (defaults to input ref)'
required: false
actions-ref:
description: 'Git ref to get .github/actions from (for testing older refs that lack these actions)'
required: false
default: ''

runs:
using: composite
steps:
- name: Checkout
- name: Checkout source
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
fetch-depth: 1

- name: Checkout actions from actions-ref
if: inputs.actions-ref != '' && inputs.actions-ref != inputs.ref
uses: actions/checkout@v4
with:
ref: ${{ inputs.actions-ref }}
sparse-checkout: .github/actions
path: .actions-temp

- name: Copy actions from actions-ref
if: inputs.actions-ref != '' && inputs.actions-ref != inputs.ref
shell: bash
run: |
rm -rf .github/actions
cp -r .actions-temp/.github/actions .github/actions
rm -rf .actions-temp

- name: Setup
uses: ./.github/actions/setup-nx
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-nx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ runs:
id: setup_node
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: yarn install
if: inputs.cache_mode == 'rw' && inputs.yarn_postinstall == 'true'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/module-size-comparison.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Download all base shard results
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Download all PR shard results
uses: actions/download-artifact@v4
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/module-size-vs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ jobs:
total-shards: ${{ strategy.job-total }}
artifact-prefix: module-size-release
base-ref: ${{ needs.prepare.outputs.release-tag }}
actions-ref: latest

# Cache release results (only when we had to build)
cache-release-results:
Expand All @@ -146,13 +147,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
ref: latest
sparse-checkout: |
scripts/ci/merge-module-size-results.mjs

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Download all release shard results
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -187,14 +189,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
ref: latest
sparse-checkout: |
scripts/ci/compare-module-sizes.mjs
scripts/ci/merge-module-size-results.mjs

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Download all latest shard results
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
registry-url: 'https://registry.npmjs.org'

- name: Yarn
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.19.4
v22.21.1
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"private": true,
"engines": {
"node": "^20.19.4",
"node": "^22.21.1",
"yarn": "^1.22.21"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ag-grid-enterprise/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,6 @@
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.7.0",
"jest-canvas-mock": "2.5.2",
"canvas": "^2.10.2"
"canvas": "^3.2.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,13 @@ export class FormulaInputRangeSyncFeature extends BeanStub {
return;
}

const liveRanges = this.getLiveRanges();
const latestRange = liveRanges.length ? _last(liveRanges) : null;
const latestRef = latestRange ? rangeToRef(this.beans, latestRange) : null;
const hasInsertCandidate =
!!latestRange && !this.trackedRanges.has(latestRange) && !!latestRef && latestRef !== this.editingCellRef;
const shouldInsert = event.finished && (event.started || hasInsertCandidate);

// Re-tag ranges if their colors are out of sync with the formula tokens.
const reTagged = this.ensureTrackedRangeColors();

Expand All @@ -273,12 +280,12 @@ export class FormulaInputRangeSyncFeature extends BeanStub {
return;
}

if (event.started) {
if (event.started || hasInsertCandidate) {
// Remember caret so we can restore it after any selection-driven edits.
this.field.rememberCaret();
}

if (this.handleRemovedRangeTokens()) {
if (!hasInsertCandidate && this.handleRemovedRangeTokens()) {
this.field.restoreCaretAfterToken();
this.refocusEditingCell();
return;
Expand All @@ -296,7 +303,7 @@ export class FormulaInputRangeSyncFeature extends BeanStub {
return;
}

if (event.started && event.finished) {
if (shouldInsert) {
const { action, previousRef, tokenIndex } = this.field.applyRangeInsert(ref);

if (action === 'none') {
Expand Down
4 changes: 2 additions & 2 deletions plugins/ag-grid-task-autogen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "35.0.0-beta.20260111.2037",
"private": true,
"dependencies": {
"@nx/devkit": "18.3.4",
"nx": "18.3.4",
"@nx/devkit": "20.3.1",
"nx": "20.3.1",
"tslib": "^2.3.0"
},
"type": "module",
Expand Down
Loading
Loading