cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-23 16:09:11 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: upgrade base-ui

Browse Source
This commit is contained in:
Carlos Valente
2025-10-05 08:36:23 +02:00
committed by Alex Christoffer Rasmussen
parent 846eaf569d
commit 4b81725e80
6 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/package.json
+1 -1
View File
@@ -4,7 +4,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@base-ui-components/react": "1.0.0-beta.3", "@base-ui-components/react": "1.0.0-beta.4",
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0", "@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
apps/client/src/common/components/select/Select.module.scss
+10 -2
View File
@@ -62,8 +62,6 @@
padding: 2px; padding: 2px;
border-radius: $component-border-radius-md; border-radius: $component-border-radius-md;
color: $ui-white; color: $ui-white;
overflow-y: auto;
max-height: 20rem;
border: 1px solid $gray-1000; border: 1px solid $gray-1000;
&[data-side='start'] { &[data-side='start'] {
@@ -73,6 +71,16 @@
} }
} }
.list {
box-sizing: border-box;
position: relative;
padding-block: 0.25rem;
overflow-y: auto;
max-height: 20rem;
max-height: var(--available-height);
scroll-padding-block: 1.5rem;
}
.item { .item {
box-sizing: border-box; box-sizing: border-box;
outline: 0; outline: 0;
apps/client/src/common/components/select/Select.tsx
+11 -8
View File
@@ -31,14 +31,17 @@ export default function Select<T>({ options, fluid, size = 'medium', ...selectRo
<BaseSelect.Positioner side='bottom' align='start'> <BaseSelect.Positioner side='bottom' align='start'>
<BaseSelect.ScrollUpArrow className={styles.scrollArrow} /> <BaseSelect.ScrollUpArrow className={styles.scrollArrow} />
<BaseSelect.Popup className={styles.popup}> <BaseSelect.Popup className={styles.popup}>
{options.map(({ disabled, label, value }) => ( <BaseSelect.Arrow />
<BaseSelect.Item key={String(value)} className={styles.item} value={value} disabled={disabled}> <BaseSelect.List className={styles.list}>
<BaseSelect.ItemIndicator className={styles.itemIndicator}> {options.map(({ disabled, label, value }) => (
<IoCheckmark className={styles.itemIndicatorIcon} /> <BaseSelect.Item key={String(value)} className={styles.item} value={value} disabled={disabled}>
</BaseSelect.ItemIndicator> <BaseSelect.ItemIndicator className={styles.itemIndicator}>
<BaseSelect.ItemText className={styles.itemLabel}>{label}</BaseSelect.ItemText> <IoCheckmark className={styles.itemIndicatorIcon} />
</BaseSelect.Item> </BaseSelect.ItemIndicator>
))} <BaseSelect.ItemText className={styles.itemLabel}>{label}</BaseSelect.ItemText>
</BaseSelect.Item>
))}
</BaseSelect.List>
</BaseSelect.Popup> </BaseSelect.Popup>
<BaseSelect.ScrollDownArrow className={styles.scrollArrow} /> <BaseSelect.ScrollDownArrow className={styles.scrollArrow} />
</BaseSelect.Positioner> </BaseSelect.Positioner>
apps/client/src/features/sharing/GenerateLinkForm.tsx
+3
View File
@@ -225,6 +225,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
<Switch <Switch
size='large' size='large'
name='lockNav' name='lockNav'
data-testid='lockNav'
checked={watch('lockNav')} checked={watch('lockNav')}
onCheckedChange={(checked) => setValue('lockNav', checked, { shouldDirty: true })} onCheckedChange={(checked) => setValue('lockNav', checked, { shouldDirty: true })}
disabled={watch('lockConfig')} disabled={watch('lockConfig')}
@@ -239,6 +240,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
<Switch <Switch
size='large' size='large'
name='lockConfig' name='lockConfig'
data-testid='lockConfig'
checked={watch('lockConfig')} checked={watch('lockConfig')}
onCheckedChange={(checked) => { onCheckedChange={(checked) => {
if (checked) { if (checked) {
@@ -254,6 +256,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
<Switch <Switch
size='large' size='large'
name='authenticate' name='authenticate'
data-testid='authenticate'
checked={watch('authenticate')} checked={watch('authenticate')}
onCheckedChange={(checked) => setValue('authenticate', checked, { shouldDirty: true })} onCheckedChange={(checked) => setValue('authenticate', checked, { shouldDirty: true })}
/> />
e2e/tests/features/206-url-preset.spec.ts
+5 -4
View File
@@ -92,12 +92,13 @@ test.describe('URL Preset', () => {
// select options // select options
await page.getByRole('combobox').filter({ hasText: 'Timer' }).click(); await page.getByRole('combobox').filter({ hasText: 'Timer' }).click();
await page.getByText('URL Preset: testing').click(); await page.getByText('URL Preset: testing').click();
await page.locator('button[name="lockNav"]').click(); await page.getByTestId('lockNav').click();
await page.locator('button[name="lockConfig"]').click(); await page.getByTestId('lockConfig').click();
// create and verify link // create and verify link
await page.getByRole('button', { name: 'Create share link' }).click(); await page.getByRole('button', { name: 'Create share link' }).click();
await expect(page.getByTestId('copy-link')).toContainText('/preset/testing'); await expect(page.getByTestId('copy-link')).toContainText('/preset/testing');
await expect(page.getByTestId('copy-link')).toContainText('/preset/testing');
await expect(page.getByTestId('copy-link')).toContainText('n=1'); await expect(page.getByTestId('copy-link')).toContainText('n=1');
// verify the preset // verify the preset
@@ -140,7 +141,7 @@ test.describe('Sharing from cuesheet', () => {
await page.getByRole('textbox').fill('cuesheet-read-test'); await page.getByRole('textbox').fill('cuesheet-read-test');
await page.getByText('Custom write').click(); await page.getByText('Custom write').click();
await page.getByText('Custom read').click(); await page.getByText('Custom read').click();
await page.locator('button[name="lockNav"]').click(); await page.getByTestId('lockNav').click();
await page.getByTestId('write-flag').click(); await page.getByTestId('write-flag').click();
await page.getByTestId('write-cue').click(); await page.getByTestId('write-cue').click();
await page.getByTestId('write-title').click(); await page.getByTestId('write-title').click();
@@ -184,7 +185,7 @@ test.describe('Sharing from cuesheet', () => {
await page.getByRole('textbox').fill('cuesheet-scope-test'); await page.getByRole('textbox').fill('cuesheet-scope-test');
await page.getByText('Custom write').click(); await page.getByText('Custom write').click();
await page.getByText('Custom read').click(); await page.getByText('Custom read').click();
await page.locator('button[name="lockNav"]').click(); await page.getByTestId('lockNav').click();
await page.getByTestId('write-flag').click(); await page.getByTestId('write-flag').click();
await page.getByTestId('write-cue').click(); await page.getByTestId('write-cue').click();
await page.getByTestId('write-timeStart').click(); await page.getByTestId('write-timeStart').click();
pnpm-lock.yaml
Generated
+14 -14
View File
@@ -96,8 +96,8 @@ importers:
apps/client: apps/client:
dependencies: dependencies:
'@base-ui-components/react': '@base-ui-components/react':
specifier: 1.0.0-beta.3 specifier: 1.0.0-beta.4
version: 1.0.0-beta.3(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) version: 1.0.0-beta.4(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@dnd-kit/core': '@dnd-kit/core':
specifier: ^6.3.1 specifier: ^6.3.1
version: 6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) version: 6.3.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
@@ -699,8 +699,8 @@ packages:
peerDependencies: peerDependencies:
'@babel/core': ^7.0.0-0 '@babel/core': ^7.0.0-0
'@babel/runtime@7.28.3': '@babel/runtime@7.28.4':
resolution: {integrity: sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==} resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
'@babel/template@7.22.15': '@babel/template@7.22.15':
@@ -743,8 +743,8 @@ packages:
resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==} resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
'@base-ui-components/react@1.0.0-beta.3': '@base-ui-components/react@1.0.0-beta.4':
resolution: {integrity: sha512-4sAq6zmDA9ixV2HRjjeM1+tSEw5R6nvGjXUQmFoQnC3DZLEUdwO94gWDmUDdpoDuChn27jdbaJs9F0Ih4w2UAA==} resolution: {integrity: sha512-sPYKj26gbFHD2ZsrMYqQshXnMuomBodzPn+d0dDxWieTj232XCQ9QGt9fU9l5SDGC9hi8s24lDlg9FXPSI7T8A==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
peerDependencies: peerDependencies:
'@types/react': ^17 || ^18 || ^19 '@types/react': ^17 || ^18 || ^19
@@ -754,8 +754,8 @@ packages:
'@types/react': '@types/react':
optional: true optional: true
'@base-ui-components/utils@0.1.1': '@base-ui-components/utils@0.1.2':
resolution: {integrity: sha512-HWXZA8upEKgrdL1rQqxWu1H+2tB2cXzY2jCxvgnpUv3eoWN2jldhXxMZnXIjZF7jahGxSWXfSIM/qskiTWFFxA==} resolution: {integrity: sha512-aEitDGpMsYO2qnSpYOwZNykn9Rzn2ioyEVk2fyDRH7t+TIHVKpp9CeV7SPTq43M9mMSDxQ+7UeZJVkrj2dCVIQ==}
peerDependencies: peerDependencies:
'@types/react': ^17 || ^18 || ^19 '@types/react': ^17 || ^18 || ^19
react: ^17 || ^18 || ^19 react: ^17 || ^18 || ^19
@@ -5646,7 +5646,7 @@ snapshots:
'@babel/core': 7.27.4 '@babel/core': 7.27.4
'@babel/helper-plugin-utils': 7.27.1 '@babel/helper-plugin-utils': 7.27.1
'@babel/runtime@7.28.3': {} '@babel/runtime@7.28.4': {}
'@babel/template@7.22.15': '@babel/template@7.22.15':
dependencies: dependencies:
@@ -5732,10 +5732,10 @@ snapshots:
'@babel/helper-string-parser': 7.27.1 '@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.27.1 '@babel/helper-validator-identifier': 7.27.1
'@base-ui-components/react@1.0.0-beta.3(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': '@base-ui-components/react@1.0.0-beta.4(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
dependencies: dependencies:
'@babel/runtime': 7.28.3 '@babel/runtime': 7.28.4
'@base-ui-components/utils': 0.1.1(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@base-ui-components/utils': 0.1.2(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@floating-ui/react-dom': 2.1.6(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@floating-ui/react-dom': 2.1.6(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
'@floating-ui/utils': 0.2.10 '@floating-ui/utils': 0.2.10
react: 19.1.1 react: 19.1.1
@@ -5746,9 +5746,9 @@ snapshots:
optionalDependencies: optionalDependencies:
'@types/react': 19.1.12 '@types/react': 19.1.12
'@base-ui-components/utils@0.1.1(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': '@base-ui-components/utils@0.1.2(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
dependencies: dependencies:
'@babel/runtime': 7.28.3 '@babel/runtime': 7.28.4
'@floating-ui/utils': 0.2.10 '@floating-ui/utils': 0.2.10
react: 19.1.1 react: 19.1.1
react-dom: 19.1.1(react@19.1.1) react-dom: 19.1.1(react@19.1.1)