@google/gemini-cli 0.8.0-preview.1 → 0.9.0-nightly.20251001.33269bdb
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +2 -2
- package/dist/src/commands/extensions/update.js +10 -1
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extensions/update.d.ts +4 -5
- package/dist/src/config/extensions/update.js +54 -40
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +74 -60
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +9 -0
- package/dist/src/config/settingsSchema.js +9 -0
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +8 -0
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ui/App.js +1 -17
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/AppContainer.js +4 -4
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +5 -10
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +4 -4
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.d.ts +1 -2
- package/dist/src/ui/components/ContextUsageDisplay.js +2 -4
- package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/Footer.js +14 -5
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +6 -0
- package/dist/src/ui/components/InputPrompt.js +43 -13
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +3 -4
- package/dist/src/ui/hooks/slashCommandProcessor.js +3 -2
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.d.ts +8 -5
- package/dist/src/ui/hooks/useExtensionUpdates.js +87 -58
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +156 -79
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.js +50 -23
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +24 -0
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.d.ts +1 -3
- package/dist/src/ui/layouts/DefaultAppLayout.js +2 -2
- package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +27 -0
- package/dist/src/ui/state/extensions.js +45 -0
- package/dist/src/ui/state/extensions.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +128 -128
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/src/utils/math.d.ts +0 -13
- package/dist/src/utils/math.js +0 -14
- package/dist/src/utils/math.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,31 +7,15 @@ import { vi } from 'vitest';
|
|
|
7
7
|
import * as fs from 'node:fs';
|
|
8
8
|
import * as os from 'node:os';
|
|
9
9
|
import * as path from 'node:path';
|
|
10
|
-
import {
|
|
10
|
+
import { ExtensionStorage, annotateActiveExtensions, loadExtension, } from '../../config/extension.js';
|
|
11
11
|
import { createExtension } from '../../test-utils/createExtension.js';
|
|
12
12
|
import { useExtensionUpdates } from './useExtensionUpdates.js';
|
|
13
13
|
import { GEMINI_DIR } from '@google/gemini-cli-core';
|
|
14
|
-
import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
|
|
15
14
|
import { renderHook, waitFor } from '@testing-library/react';
|
|
16
15
|
import { MessageType } from '../types.js';
|
|
17
16
|
import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
getRemotes: vi.fn(),
|
|
21
|
-
fetch: vi.fn(),
|
|
22
|
-
checkout: vi.fn(),
|
|
23
|
-
listRemote: vi.fn(),
|
|
24
|
-
revparse: vi.fn(),
|
|
25
|
-
// Not a part of the actual API, but we need to use this to do the correct
|
|
26
|
-
// file system interactions.
|
|
27
|
-
path: vi.fn(),
|
|
28
|
-
};
|
|
29
|
-
vi.mock('simple-git', () => ({
|
|
30
|
-
simpleGit: vi.fn((path) => {
|
|
31
|
-
mockGit.path.mockReturnValue(path);
|
|
32
|
-
return mockGit;
|
|
33
|
-
}),
|
|
34
|
-
}));
|
|
17
|
+
import { checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
|
|
18
|
+
import { ExtensionUpdateState } from '../state/extensions.js';
|
|
35
19
|
vi.mock('os', async (importOriginal) => {
|
|
36
20
|
const mockedOs = await importOriginal();
|
|
37
21
|
return {
|
|
@@ -39,39 +23,9 @@ vi.mock('os', async (importOriginal) => {
|
|
|
39
23
|
homedir: vi.fn(),
|
|
40
24
|
};
|
|
41
25
|
});
|
|
42
|
-
vi.mock('../../config/
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
...actual,
|
|
46
|
-
isWorkspaceTrusted: vi.fn(),
|
|
47
|
-
};
|
|
48
|
-
});
|
|
49
|
-
const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
|
|
50
|
-
const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
|
|
51
|
-
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
52
|
-
const actual = await importOriginal();
|
|
53
|
-
return {
|
|
54
|
-
...actual,
|
|
55
|
-
logExtensionInstallEvent: mockLogExtensionInstallEvent,
|
|
56
|
-
logExtensionUninstall: mockLogExtensionUninstall,
|
|
57
|
-
ExtensionInstallEvent: vi.fn(),
|
|
58
|
-
ExtensionUninstallEvent: vi.fn(),
|
|
59
|
-
};
|
|
60
|
-
});
|
|
61
|
-
vi.mock('child_process', async (importOriginal) => {
|
|
62
|
-
const actual = await importOriginal();
|
|
63
|
-
return {
|
|
64
|
-
...actual,
|
|
65
|
-
execSync: vi.fn(),
|
|
66
|
-
};
|
|
67
|
-
});
|
|
68
|
-
const mockQuestion = vi.hoisted(() => vi.fn());
|
|
69
|
-
const mockClose = vi.hoisted(() => vi.fn());
|
|
70
|
-
vi.mock('node:readline', () => ({
|
|
71
|
-
createInterface: vi.fn(() => ({
|
|
72
|
-
question: mockQuestion,
|
|
73
|
-
close: mockClose,
|
|
74
|
-
})),
|
|
26
|
+
vi.mock('../../config/extensions/update.js', () => ({
|
|
27
|
+
checkForAllExtensionUpdates: vi.fn(),
|
|
28
|
+
updateExtension: vi.fn(),
|
|
75
29
|
}));
|
|
76
30
|
describe('useExtensionUpdates', () => {
|
|
77
31
|
let tempHomeDir;
|
|
@@ -81,7 +35,8 @@ describe('useExtensionUpdates', () => {
|
|
|
81
35
|
vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
|
|
82
36
|
userExtensionsDir = path.join(tempHomeDir, GEMINI_DIR, 'extensions');
|
|
83
37
|
fs.mkdirSync(userExtensionsDir, { recursive: true });
|
|
84
|
-
|
|
38
|
+
vi.mocked(checkForAllExtensionUpdates).mockReset();
|
|
39
|
+
vi.mocked(updateExtension).mockReset();
|
|
85
40
|
});
|
|
86
41
|
afterEach(() => {
|
|
87
42
|
fs.rmSync(tempHomeDir, { recursive: true, force: true });
|
|
@@ -103,16 +58,15 @@ describe('useExtensionUpdates', () => {
|
|
|
103
58
|
];
|
|
104
59
|
const addItem = vi.fn();
|
|
105
60
|
const cwd = '/test/cwd';
|
|
106
|
-
|
|
107
|
-
{
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
61
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
|
|
62
|
+
dispatch({
|
|
63
|
+
type: 'SET_STATE',
|
|
64
|
+
payload: {
|
|
65
|
+
name: 'test-extension',
|
|
66
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
111
67
|
},
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
mockGit.revparse.mockResolvedValue('local-hash');
|
|
115
|
-
mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
|
|
68
|
+
});
|
|
69
|
+
});
|
|
116
70
|
renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
|
|
117
71
|
await waitFor(() => {
|
|
118
72
|
expect(addItem).toHaveBeenCalledWith({
|
|
@@ -134,25 +88,19 @@ describe('useExtensionUpdates', () => {
|
|
|
134
88
|
});
|
|
135
89
|
const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()))[0];
|
|
136
90
|
const addItem = vi.fn();
|
|
137
|
-
|
|
138
|
-
{
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
91
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
|
|
92
|
+
dispatch({
|
|
93
|
+
type: 'SET_STATE',
|
|
94
|
+
payload: {
|
|
95
|
+
name: 'test-extension',
|
|
96
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
142
97
|
},
|
|
143
|
-
},
|
|
144
|
-
]);
|
|
145
|
-
mockGit.revparse.mockResolvedValue('local-hash');
|
|
146
|
-
mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
|
|
147
|
-
mockGit.clone.mockImplementation(async (_, destination) => {
|
|
148
|
-
fs.mkdirSync(path.join(mockGit.path(), destination), {
|
|
149
|
-
recursive: true,
|
|
150
98
|
});
|
|
151
|
-
fs.writeFileSync(path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), JSON.stringify({ name: 'test-extension', version: '1.1.0' }));
|
|
152
99
|
});
|
|
153
|
-
vi.mocked(
|
|
154
|
-
|
|
155
|
-
|
|
100
|
+
vi.mocked(updateExtension).mockResolvedValue({
|
|
101
|
+
originalVersion: '1.0.0',
|
|
102
|
+
updatedVersion: '1.1.0',
|
|
103
|
+
name: '',
|
|
156
104
|
});
|
|
157
105
|
renderHook(() => useExtensionUpdates([extension], addItem, tempHomeDir));
|
|
158
106
|
await waitFor(() => {
|
|
@@ -160,7 +108,136 @@ describe('useExtensionUpdates', () => {
|
|
|
160
108
|
type: MessageType.INFO,
|
|
161
109
|
text: 'Extension "test-extension" successfully updated: 1.0.0 → 1.1.0.',
|
|
162
110
|
}, expect.any(Number));
|
|
163
|
-
}, { timeout:
|
|
111
|
+
}, { timeout: 4000 });
|
|
112
|
+
});
|
|
113
|
+
it('should batch update notifications for multiple extensions', async () => {
|
|
114
|
+
const extensionDir1 = createExtension({
|
|
115
|
+
extensionsDir: userExtensionsDir,
|
|
116
|
+
name: 'test-extension-1',
|
|
117
|
+
version: '1.0.0',
|
|
118
|
+
installMetadata: {
|
|
119
|
+
source: 'https://some.git/repo1',
|
|
120
|
+
type: 'git',
|
|
121
|
+
autoUpdate: true,
|
|
122
|
+
},
|
|
123
|
+
});
|
|
124
|
+
const extensionDir2 = createExtension({
|
|
125
|
+
extensionsDir: userExtensionsDir,
|
|
126
|
+
name: 'test-extension-2',
|
|
127
|
+
version: '2.0.0',
|
|
128
|
+
installMetadata: {
|
|
129
|
+
source: 'https://some.git/repo2',
|
|
130
|
+
type: 'git',
|
|
131
|
+
autoUpdate: true,
|
|
132
|
+
},
|
|
133
|
+
});
|
|
134
|
+
const extensions = annotateActiveExtensions([
|
|
135
|
+
loadExtension({
|
|
136
|
+
extensionDir: extensionDir1,
|
|
137
|
+
workspaceDir: tempHomeDir,
|
|
138
|
+
}),
|
|
139
|
+
loadExtension({
|
|
140
|
+
extensionDir: extensionDir2,
|
|
141
|
+
workspaceDir: tempHomeDir,
|
|
142
|
+
}),
|
|
143
|
+
], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
|
|
144
|
+
const addItem = vi.fn();
|
|
145
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
|
|
146
|
+
dispatch({
|
|
147
|
+
type: 'SET_STATE',
|
|
148
|
+
payload: {
|
|
149
|
+
name: 'test-extension-1',
|
|
150
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
151
|
+
},
|
|
152
|
+
});
|
|
153
|
+
dispatch({
|
|
154
|
+
type: 'SET_STATE',
|
|
155
|
+
payload: {
|
|
156
|
+
name: 'test-extension-2',
|
|
157
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
158
|
+
},
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
vi.mocked(updateExtension)
|
|
162
|
+
.mockResolvedValueOnce({
|
|
163
|
+
originalVersion: '1.0.0',
|
|
164
|
+
updatedVersion: '1.1.0',
|
|
165
|
+
name: '',
|
|
166
|
+
})
|
|
167
|
+
.mockResolvedValueOnce({
|
|
168
|
+
originalVersion: '2.0.0',
|
|
169
|
+
updatedVersion: '2.1.0',
|
|
170
|
+
name: '',
|
|
171
|
+
});
|
|
172
|
+
renderHook(() => useExtensionUpdates(extensions, addItem, tempHomeDir));
|
|
173
|
+
await waitFor(() => {
|
|
174
|
+
expect(addItem).toHaveBeenCalledTimes(2);
|
|
175
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
176
|
+
type: MessageType.INFO,
|
|
177
|
+
text: 'Extension "test-extension-1" successfully updated: 1.0.0 → 1.1.0.',
|
|
178
|
+
}, expect.any(Number));
|
|
179
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
180
|
+
type: MessageType.INFO,
|
|
181
|
+
text: 'Extension "test-extension-2" successfully updated: 2.0.0 → 2.1.0.',
|
|
182
|
+
}, expect.any(Number));
|
|
183
|
+
}, { timeout: 4000 });
|
|
184
|
+
});
|
|
185
|
+
it('should batch update notifications for multiple extensions with autoUpdate: false', async () => {
|
|
186
|
+
const extensions = [
|
|
187
|
+
{
|
|
188
|
+
name: 'test-extension-1',
|
|
189
|
+
type: 'git',
|
|
190
|
+
version: '1.0.0',
|
|
191
|
+
path: '/some/path1',
|
|
192
|
+
isActive: true,
|
|
193
|
+
installMetadata: {
|
|
194
|
+
type: 'git',
|
|
195
|
+
source: 'https://some/repo1',
|
|
196
|
+
autoUpdate: false,
|
|
197
|
+
},
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
name: 'test-extension-2',
|
|
201
|
+
type: 'git',
|
|
202
|
+
version: '2.0.0',
|
|
203
|
+
path: '/some/path2',
|
|
204
|
+
isActive: true,
|
|
205
|
+
installMetadata: {
|
|
206
|
+
type: 'git',
|
|
207
|
+
source: 'https://some/repo2',
|
|
208
|
+
autoUpdate: false,
|
|
209
|
+
},
|
|
210
|
+
},
|
|
211
|
+
];
|
|
212
|
+
const addItem = vi.fn();
|
|
213
|
+
const cwd = '/test/cwd';
|
|
214
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
|
|
215
|
+
dispatch({ type: 'BATCH_CHECK_START' });
|
|
216
|
+
dispatch({
|
|
217
|
+
type: 'SET_STATE',
|
|
218
|
+
payload: {
|
|
219
|
+
name: 'test-extension-1',
|
|
220
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
221
|
+
},
|
|
222
|
+
});
|
|
223
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
224
|
+
dispatch({
|
|
225
|
+
type: 'SET_STATE',
|
|
226
|
+
payload: {
|
|
227
|
+
name: 'test-extension-2',
|
|
228
|
+
state: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
229
|
+
},
|
|
230
|
+
});
|
|
231
|
+
dispatch({ type: 'BATCH_CHECK_END' });
|
|
232
|
+
});
|
|
233
|
+
renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
|
|
234
|
+
await waitFor(() => {
|
|
235
|
+
expect(addItem).toHaveBeenCalledTimes(1);
|
|
236
|
+
expect(addItem).toHaveBeenCalledWith({
|
|
237
|
+
type: MessageType.INFO,
|
|
238
|
+
text: 'You have 2 extensions with an update available, run "/extensions list" for more information.',
|
|
239
|
+
}, expect.any(Number));
|
|
240
|
+
});
|
|
164
241
|
});
|
|
165
242
|
});
|
|
166
243
|
//# sourceMappingURL=useExtensionUpdates.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAA2B,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EACL,2BAA2B,EAC3B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrC,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAa,CAAC;IACnD,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,2BAA2B,EAAE,EAAE,CAAC,EAAE,EAAE;IACpC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,WAAmB,CAAC;IACxB,IAAI,iBAAyB,CAAC;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,EAAE,CAAC,WAAW,CAC1B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAChD,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACrE,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,SAAS,EAAE,CAAC;QACnD,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,UAAU,GAAG;YACjB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,mBAAmB;oBAC3B,UAAU,EAAE,KAAK;iBAClB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE,CACd,mBAAmB,CAAC,UAAkC,EAAE,OAAO,EAAE,GAAG,CAAC,CACtE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,6FAA6F;aACpG,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,YAAY,GAAG,eAAe,CAAC;YACnC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,uBAAuB;gBAC/B,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,wBAAwB,CACxC,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,CAAE,CAAC,EAC7D,WAAW,EACX,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,CACxE,CAAC,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,iBAAiB,CAAC;YAC3C,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAEzE,MAAM,OAAO,CACX,GAAG,EAAE;YACH,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,iEAAiE;aACxE,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,aAAa,GAAG,eAAe,CAAC;YACpC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,wBAAwB;gBAChC,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,eAAe,CAAC;YACpC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,wBAAwB;gBAChC,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,wBAAwB,CACzC;YACE,aAAa,CAAC;gBACZ,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,WAAW;aAC1B,CAAE;YACH,aAAa,CAAC;gBACZ,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,WAAW;aAC1B,CAAE;SACJ,EACD,WAAW,EACX,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC;aACvB,qBAAqB,CAAC;YACrB,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC;aACD,qBAAqB,CAAC;YACrB,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEL,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAExE,MAAM,OAAO,CACX,GAAG,EAAE;YACH,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,mEAAmE;aAC1E,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,mEAAmE;aAC1E,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;QAChG,MAAM,UAAU,GAAG;YACjB;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,oBAAoB;oBAC5B,UAAU,EAAE,KAAK;iBAClB;aACF;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,oBAAoB;oBAC5B,UAAU,EAAE,KAAK;iBAClB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACxC,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5C,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,QAAQ,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACxC,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE,CACd,mBAAmB,CAAC,UAAkC,EAAE,OAAO,EAAE,GAAG,CAAC,CACtE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,8FAA8F;aACrG,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { useReducer, useRef, useEffect } from 'react';
|
|
6
|
+
import { useReducer, useRef, useEffect, useCallback } from 'react';
|
|
7
7
|
import { useKeypress } from './useKeypress.js';
|
|
8
8
|
const NUMBER_INPUT_TIMEOUT_MS = 1000;
|
|
9
9
|
/**
|
|
@@ -50,7 +50,8 @@ const computeInitialIndex = (initialIndex, items, initialKey) => {
|
|
|
50
50
|
function selectionListReducer(state, action) {
|
|
51
51
|
switch (action.type) {
|
|
52
52
|
case 'SET_ACTIVE_INDEX': {
|
|
53
|
-
const { index
|
|
53
|
+
const { index } = action.payload;
|
|
54
|
+
const { items } = state;
|
|
54
55
|
// Only update if index actually changed and is valid
|
|
55
56
|
if (index === state.activeIndex) {
|
|
56
57
|
return state;
|
|
@@ -61,7 +62,7 @@ function selectionListReducer(state, action) {
|
|
|
61
62
|
return state;
|
|
62
63
|
}
|
|
63
64
|
case 'MOVE_UP': {
|
|
64
|
-
const { items } =
|
|
65
|
+
const { items } = state;
|
|
65
66
|
const newIndex = findNextValidIndex(state.activeIndex, 'up', items);
|
|
66
67
|
if (newIndex !== state.activeIndex) {
|
|
67
68
|
return { ...state, activeIndex: newIndex, pendingHighlight: true };
|
|
@@ -69,7 +70,7 @@ function selectionListReducer(state, action) {
|
|
|
69
70
|
return state;
|
|
70
71
|
}
|
|
71
72
|
case 'MOVE_DOWN': {
|
|
72
|
-
const { items } =
|
|
73
|
+
const { items } = state;
|
|
73
74
|
const newIndex = findNextValidIndex(state.activeIndex, 'down', items);
|
|
74
75
|
if (newIndex !== state.activeIndex) {
|
|
75
76
|
return { ...state, activeIndex: newIndex, pendingHighlight: true };
|
|
@@ -85,13 +86,12 @@ function selectionListReducer(state, action) {
|
|
|
85
86
|
state.activeIndex !== state.initialIndex
|
|
86
87
|
? state.items[state.activeIndex]?.key
|
|
87
88
|
: undefined;
|
|
88
|
-
|
|
89
|
-
return state;
|
|
90
|
-
}
|
|
89
|
+
// We don't need to check for equality here anymore as it is handled in the effect
|
|
91
90
|
const targetIndex = computeInitialIndex(initialIndex, items, activeKey);
|
|
92
91
|
return {
|
|
93
92
|
...state,
|
|
94
93
|
items,
|
|
94
|
+
initialIndex,
|
|
95
95
|
activeIndex: targetIndex,
|
|
96
96
|
pendingHighlight: false,
|
|
97
97
|
};
|
|
@@ -110,6 +110,21 @@ function selectionListReducer(state, action) {
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
|
+
function areBaseItemsEqual(a, b) {
|
|
114
|
+
if (a === b)
|
|
115
|
+
return true;
|
|
116
|
+
if (a.length !== b.length)
|
|
117
|
+
return false;
|
|
118
|
+
for (let i = 0; i < a.length; i++) {
|
|
119
|
+
if (a[i].key !== b[i].key || a[i].disabled !== b[i].disabled) {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
function toBaseItems(items) {
|
|
126
|
+
return items.map(({ key, disabled }) => ({ key, disabled }));
|
|
127
|
+
}
|
|
113
128
|
/**
|
|
114
129
|
* A headless hook that provides keyboard navigation and selection logic
|
|
115
130
|
* for list-based selection components like radio buttons and menus.
|
|
@@ -122,19 +137,31 @@ function selectionListReducer(state, action) {
|
|
|
122
137
|
* - Wrapping navigation (last to first, first to last)
|
|
123
138
|
*/
|
|
124
139
|
export function useSelectionList({ items, initialIndex = 0, onSelect, onHighlight, isFocused = true, showNumbers = false, }) {
|
|
125
|
-
const
|
|
126
|
-
|
|
140
|
+
const baseItems = toBaseItems(items);
|
|
141
|
+
const [state, dispatch] = useReducer(selectionListReducer, {
|
|
142
|
+
activeIndex: computeInitialIndex(initialIndex, baseItems),
|
|
127
143
|
initialIndex,
|
|
128
144
|
pendingHighlight: false,
|
|
129
145
|
pendingSelect: false,
|
|
130
|
-
items,
|
|
146
|
+
items: baseItems,
|
|
131
147
|
});
|
|
132
148
|
const numberInputRef = useRef('');
|
|
133
149
|
const numberInputTimer = useRef(null);
|
|
150
|
+
const prevBaseItemsRef = useRef(baseItems);
|
|
151
|
+
const prevInitialIndexRef = useRef(initialIndex);
|
|
134
152
|
// Initialize/synchronize state when initialIndex or items change
|
|
135
153
|
useEffect(() => {
|
|
136
|
-
|
|
137
|
-
|
|
154
|
+
const baseItemsChanged = !areBaseItemsEqual(prevBaseItemsRef.current, baseItems);
|
|
155
|
+
const initialIndexChanged = prevInitialIndexRef.current !== initialIndex;
|
|
156
|
+
if (baseItemsChanged || initialIndexChanged) {
|
|
157
|
+
dispatch({
|
|
158
|
+
type: 'INITIALIZE',
|
|
159
|
+
payload: { initialIndex, items: baseItems },
|
|
160
|
+
});
|
|
161
|
+
prevBaseItemsRef.current = baseItems;
|
|
162
|
+
prevInitialIndexRef.current = initialIndex;
|
|
163
|
+
}
|
|
164
|
+
});
|
|
138
165
|
// Handle side effects based on state changes
|
|
139
166
|
useEffect(() => {
|
|
140
167
|
let needsClear = false;
|
|
@@ -165,7 +192,8 @@ export function useSelectionList({ items, initialIndex = 0, onSelect, onHighligh
|
|
|
165
192
|
clearTimeout(numberInputTimer.current);
|
|
166
193
|
}
|
|
167
194
|
}, []);
|
|
168
|
-
|
|
195
|
+
const itemsLength = items.length;
|
|
196
|
+
const handleKeypress = useCallback((key) => {
|
|
169
197
|
const { sequence, name } = key;
|
|
170
198
|
const isNumeric = showNumbers && /^[0-9]$/.test(sequence);
|
|
171
199
|
// Clear number input buffer on non-numeric key press
|
|
@@ -174,15 +202,15 @@ export function useSelectionList({ items, initialIndex = 0, onSelect, onHighligh
|
|
|
174
202
|
numberInputRef.current = '';
|
|
175
203
|
}
|
|
176
204
|
if (name === 'k' || name === 'up') {
|
|
177
|
-
dispatch({ type: 'MOVE_UP'
|
|
205
|
+
dispatch({ type: 'MOVE_UP' });
|
|
178
206
|
return;
|
|
179
207
|
}
|
|
180
208
|
if (name === 'j' || name === 'down') {
|
|
181
|
-
dispatch({ type: 'MOVE_DOWN'
|
|
209
|
+
dispatch({ type: 'MOVE_DOWN' });
|
|
182
210
|
return;
|
|
183
211
|
}
|
|
184
212
|
if (name === 'return') {
|
|
185
|
-
dispatch({ type: 'SELECT_CURRENT'
|
|
213
|
+
dispatch({ type: 'SELECT_CURRENT' });
|
|
186
214
|
return;
|
|
187
215
|
}
|
|
188
216
|
// Handle numeric input for quick selection
|
|
@@ -200,17 +228,16 @@ export function useSelectionList({ items, initialIndex = 0, onSelect, onHighligh
|
|
|
200
228
|
}, NUMBER_INPUT_TIMEOUT_MS);
|
|
201
229
|
return;
|
|
202
230
|
}
|
|
203
|
-
if (targetIndex >= 0 && targetIndex <
|
|
231
|
+
if (targetIndex >= 0 && targetIndex < itemsLength) {
|
|
204
232
|
dispatch({
|
|
205
233
|
type: 'SET_ACTIVE_INDEX',
|
|
206
|
-
payload: { index: targetIndex
|
|
234
|
+
payload: { index: targetIndex },
|
|
207
235
|
});
|
|
208
236
|
// If the number can't be a prefix for another valid number, select immediately
|
|
209
237
|
const potentialNextNumber = Number.parseInt(newNumberInput + '0', 10);
|
|
210
|
-
if (potentialNextNumber >
|
|
238
|
+
if (potentialNextNumber > itemsLength) {
|
|
211
239
|
dispatch({
|
|
212
240
|
type: 'SELECT_CURRENT',
|
|
213
|
-
payload: { items },
|
|
214
241
|
});
|
|
215
242
|
numberInputRef.current = '';
|
|
216
243
|
}
|
|
@@ -219,7 +246,6 @@ export function useSelectionList({ items, initialIndex = 0, onSelect, onHighligh
|
|
|
219
246
|
numberInputTimer.current = setTimeout(() => {
|
|
220
247
|
dispatch({
|
|
221
248
|
type: 'SELECT_CURRENT',
|
|
222
|
-
payload: { items },
|
|
223
249
|
});
|
|
224
250
|
numberInputRef.current = '';
|
|
225
251
|
}, NUMBER_INPUT_TIMEOUT_MS);
|
|
@@ -230,11 +256,12 @@ export function useSelectionList({ items, initialIndex = 0, onSelect, onHighligh
|
|
|
230
256
|
numberInputRef.current = '';
|
|
231
257
|
}
|
|
232
258
|
}
|
|
233
|
-
},
|
|
259
|
+
}, [dispatch, itemsLength, showNumbers]);
|
|
260
|
+
useKeypress(handleKeypress, { isActive: !!(isFocused && itemsLength > 0) });
|
|
234
261
|
const setActiveIndex = (index) => {
|
|
235
262
|
dispatch({
|
|
236
263
|
type: 'SET_ACTIVE_INDEX',
|
|
237
|
-
payload: { index
|
|
264
|
+
payload: { index },
|
|
238
265
|
});
|
|
239
266
|
};
|
|
240
267
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSelectionList.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSelectionList.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useSelectionList.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useSelectionList.ts"],"names":[],"mappings":"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"}
|
|
@@ -655,6 +655,30 @@ describe('useSelectionList', () => {
|
|
|
655
655
|
rerender({ items: newItems });
|
|
656
656
|
expect(result.current.activeIndex).toBe(2);
|
|
657
657
|
});
|
|
658
|
+
it('should not re-initialize when items have identical keys but are different objects', () => {
|
|
659
|
+
const initialItems = [
|
|
660
|
+
{ value: 'A', key: 'A' },
|
|
661
|
+
{ value: 'B', key: 'B' },
|
|
662
|
+
];
|
|
663
|
+
let renderCount = 0;
|
|
664
|
+
const { rerender } = renderHook(({ items: testItems }) => {
|
|
665
|
+
renderCount++;
|
|
666
|
+
return useSelectionList({
|
|
667
|
+
onSelect: mockOnSelect,
|
|
668
|
+
onHighlight: mockOnHighlight,
|
|
669
|
+
items: testItems,
|
|
670
|
+
});
|
|
671
|
+
}, { initialProps: { items: initialItems } });
|
|
672
|
+
// Initial render
|
|
673
|
+
expect(renderCount).toBe(1);
|
|
674
|
+
// Create new items with the same keys but different object references
|
|
675
|
+
const newItems = [
|
|
676
|
+
{ value: 'A', key: 'A' },
|
|
677
|
+
{ value: 'B', key: 'B' },
|
|
678
|
+
];
|
|
679
|
+
rerender({ items: newItems });
|
|
680
|
+
expect(renderCount).toBe(2);
|
|
681
|
+
});
|
|
658
682
|
});
|
|
659
683
|
describe('Manual Control', () => {
|
|
660
684
|
it('should allow manual setting of active index via setActiveIndex', () => {
|