Skip to content

Commit 58e1934

Browse files
authored
Camera settings enhancements (#908)
1 parent cf56c2c commit 58e1934

File tree

4 files changed

+8
-48
lines changed

4 files changed

+8
-48
lines changed

web_ui/src/pages/camera-page/components/sidebar/device-settings-category.component.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export const DeviceSettingsCategory = ({ name, configuration }: DeviceSettingsCa
2222
const { deviceConfig, setDeviceConfig } = useDeviceSettings();
2323

2424
const updateDeviceConfig = (configName: string, value: string | number) => {
25-
setDeviceConfig([
26-
...deviceConfig.map((currentConfig) => {
25+
setDeviceConfig(
26+
deviceConfig.map((currentConfig) => {
2727
if (isEqual(configName, currentConfig.name)) {
2828
return {
2929
...currentConfig,
@@ -32,14 +32,14 @@ export const DeviceSettingsCategory = ({ name, configuration }: DeviceSettingsCa
3232
} else {
3333
return currentConfig;
3434
}
35-
}),
36-
]);
35+
})
36+
);
3737
};
3838

3939
return (
4040
<Disclosure isHidden={!configuration.length}>
4141
<DisclosureTitle UNSAFE_className={classes.sectionHeader}>{name}</DisclosureTitle>
42-
<DisclosurePanel>
42+
<DisclosurePanel UNSAFE_style={{ background: 'var(--spectrum-global-color-gray-75)' }}>
4343
{configuration.map((currentOption) => {
4444
const shouldDisplay = isSettingVisible(currentOption, deviceConfig, dependencies);
4545
const { name: optionName, config, onChange } = currentOption;

web_ui/src/pages/camera-page/components/sidebar/device-settings-default-category.component.tsx

Lines changed: 0 additions & 38 deletions
This file was deleted.

web_ui/src/pages/camera-page/components/sidebar/device-settings.component.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { isEqual, isUndefined } from 'lodash-es';
66

77
import { useDeviceSettings } from '../../providers/device-settings-provider.component';
88
import { DeviceSettingsCategory } from './device-settings-category.component';
9-
import { DeviceSettingsDefaultCategory } from './device-settings-default-category.component';
109
import { settingsMetadata } from './device-settings-metadata';
1110

1211
const Header = ({ text }: { text: string }) => (
@@ -55,7 +54,6 @@ export const DeviceSettings = () => {
5554
return <DeviceSettingsCategory name={categoryName} configuration={configuration} key={categoryName} />;
5655
})}
5756
<DeviceSettingsCategory name={defaultCategory} configuration={defaultCategoryAttributesKeys} />
58-
<DeviceSettingsDefaultCategory deviceConfig={deviceConfig} />
5957
</View>
6058
);
6159
};

web_ui/src/pages/camera-page/hooks/use-custom-settings.hook.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { useState } from 'react';
55

6-
import { DeviceConfiguration, SettingSelection } from '../providers/util';
6+
import { DeviceConfiguration } from '../providers/util';
77

88
type UseCustomSettings = {
99
isMirrored: boolean;
@@ -20,11 +20,11 @@ export const useCustomSettings = (): UseCustomSettings => {
2020
options: ['Off', 'On'],
2121
value: isMirrored ? 'On' : 'Off',
2222
defaultValue: 'Off',
23-
} as SettingSelection,
23+
},
2424
onChange: (value: number | string) => {
2525
setIsMirrored(value === 'On');
2626
},
27-
};
27+
} satisfies DeviceConfiguration;
2828

2929
return {
3030
isMirrored,

0 commit comments

Comments
 (0)