Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

fix: use mui select for sizing #1337

Merged
merged 1 commit into from
Jul 15, 2024
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
11 changes: 7 additions & 4 deletions cypress/e2e/item/settings/itemSettings.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,14 @@ describe('Item Settings', () => {
cy.visit(buildItemSettingsPath(itemId));

// default value
cy.get(`#${FILE_SETTING_MAX_WIDTH_ID}`).should('have.value', 'default');
cy.get(`#${FILE_SETTING_MAX_WIDTH_ID} + input`).should(
'have.value',
'default',
);

const newMaxWidth = MaxWidth.Small;
cy.get(`#${FILE_SETTING_MAX_WIDTH_ID}`).select(newMaxWidth);
// cy.get(`[role="option"][data-value="${newMaxWidth}"]`).click();
cy.get(`#${FILE_SETTING_MAX_WIDTH_ID}`).click();
cy.get(`[role="option"][data-value="${newMaxWidth}"]`).click();

cy.wait('@editItem').then(
({
Expand Down Expand Up @@ -437,7 +440,7 @@ describe('Item Settings', () => {

cy.visit(buildItemSettingsPath(itemId));

cy.get(`#${FILE_SETTING_MAX_WIDTH_ID}`).should(
cy.get(`#${FILE_SETTING_MAX_WIDTH_ID} + input`).should(
'have.value',
FILE.settings.maxWidth,
);
Expand Down
59 changes: 24 additions & 35 deletions src/components/item/settings/file/FileMaxWidthSetting.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { ChangeEvent } from 'react';

import { styled } from '@mui/material';
import { SelectChangeEvent } from '@mui/material';

import { LocalFileItemType, MaxWidth, S3FileItemType } from '@graasp/sdk';
import { Select } from '@graasp/ui';

import { ExpandIcon } from 'lucide-react';

Expand All @@ -14,25 +13,7 @@ import { BUILDER } from '@/langs/constants';
import ItemSettingProperty from '../ItemSettingProperty';
import { SettingVariant, SettingVariantType } from '../settingTypes';

const StyledSelect = styled('select')(({ theme }) => ({
// A reset of styles, including removing the default dropdown arrow
// appearance: 'none',
// Additional resets for further consistency
backgroundColor: 'white',
margin: 0,
fontFamily: 'inherit',
fontSize: 'inherit',
lineHeight: 'inherit',

// width: '100%',
minWidth: '15ch',
maxWidth: 'min-content',
height: theme.spacing(6),
cursor: 'pointer',
borderRadius: theme.spacing(0.5),
border: `1px solid ${theme.palette.divider}`,
padding: theme.spacing(0.5, 1),
}));
const maxWidthDefault = 'default';

export const FileMaxWidthSetting = ({
variant = SettingVariant.List,
Expand All @@ -46,29 +27,37 @@ export const FileMaxWidthSetting = ({

const { mutate: editItem } = mutations.useEditItem();

const { maxWidth } = item.settings;
const { maxWidth = maxWidthDefault } = item.settings;

const onChangeMaxWidth = (e: ChangeEvent<HTMLSelectElement>) => {
const onChangeMaxWidth = (e: SelectChangeEvent<string>) => {
editItem({
id: item.id,
settings: { maxWidth: e.target.value as MaxWidth },
});
};

const control = (
<StyledSelect
<Select
id={FILE_SETTING_MAX_WIDTH_ID}
onChange={onChangeMaxWidth}
value={maxWidth}
>
{/* option used when the maxWidth is not set */}
<option value={undefined} hidden>
{translateEnum('default')}
</option>
{Object.values(MaxWidth).map((s) => (
<option value={s}>{translateEnum(s)}</option>
))}
</StyledSelect>
value={maxWidth as string}
values={[
{
value: maxWidthDefault,
text: translateEnum(maxWidthDefault),
disabled: true,
},
...Object.values(MaxWidth).map((s) => ({
value: s,
text: translateEnum(s),
})),
]}
size="small"
sx={{
// this ensure the select stretches to be the same height as the buttons
height: '100%',
}}
/>
);

switch (variant) {
Expand Down