Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Disclosure): use logical properties #1140

Merged
merged 6 commits into from
Nov 20, 2023
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
2 changes: 1 addition & 1 deletion src/components/Disclosure/Disclosure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $gap: 8px;
outline: 2px solid var(--g-color-line-focus);
}
}
&__trigger_arrow-right {
&__trigger_arrow_end {
flex-direction: row-reverse;
}
&__trigger_disabled {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Disclosure/Disclosure.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {b} from './cn';
import './Disclosure.scss';

export type DisclosureSize = 'm' | 'l' | 'xl';
export type DisclosureArrowPosition = 'left' | 'right';
export type DisclosureArrowPosition = 'left' | 'right' | 'start' | 'end';

export interface DisclosureComposition {
Summary: typeof DisclosureSummary;
Expand Down Expand Up @@ -49,7 +49,7 @@ export const Disclosure: React.FunctionComponent<DisclosureProps> & DisclosureCo
size = 'm',
disabled = false,
defaultExpanded = false,
arrowPosition = 'left',
arrowPosition = 'start',
summary = '',
className,
keepMounted = true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,19 @@ export function DefaultDisclosureSummary({
disabled,
}: DisclosureSummaryRenderFunctionProps) {
const {size, summary, arrowPosition} = useDisclosureAttributes();
let arrowMod = arrowPosition;

if (arrowMod === 'left') {
arrowMod = 'start';
}
if (arrowMod === 'right') {
arrowMod = 'end';
}
return (
<button
type="button"
aria-expanded={expanded}
className={b('trigger', {disabled, 'arrow-right': arrowPosition === 'right'})}
className={b('trigger', {disabled, arrow: arrowMod})}
aria-controls={ariaControls}
id={id}
onClick={onClick}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Disclosure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Disclosure component that shows and hides enclosed content.
| disabled | `Boolean` | | `false` | Disabled state |
| defaultExpanded | `Boolean` | | `false` | Default opening state |
| expanded | `Boolean` | | | Controlled opening state |
| arrowPosition | `left` `right` | | `left` | Control position |
| arrowPosition | `start` `end` | | `start` | Control position |
| summary | `String` | | | Content summary |
| keepMounted | `Boolean` | | `true` | Keep content in DOM |
| onUpdate | `(expanded: boolean) => void` | | | Callback fired when the expand/collapse state is changed |
Expand Down
6 changes: 3 additions & 3 deletions src/components/Disclosure/__stories__/Disclosure.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
summary: 'Default summary',
size: 'm',
disabled: false,
arrowPosition: 'left',
arrowPosition: 'start',
},
} as Meta;

Expand Down Expand Up @@ -47,8 +47,8 @@ export const Size = SizeTemplate.bind({});
const ArrowPositionTemplate: StoryFn<DisclosureProps> = (args) => {
return (
<div className="disclosure-stories">
<Disclosure {...args} arrowPosition="left" />
<Disclosure {...args} arrowPosition="right" />
<Disclosure {...args} arrowPosition="start" />
<Disclosure {...args} arrowPosition="end" />
</div>
);
};
Expand Down
10 changes: 5 additions & 5 deletions src/components/Disclosure/__tests__/Disclosure .test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,16 @@ describe.only('Disclosure', () => {
const text = screen.queryByText(content);
expect(text).toBeInTheDocument();
});
test('arrow on the left by default', () => {
test('arrow on the start position by default', () => {
render(<Disclosure />);
const disclosure = screen.getByRole('button');

expect(disclosure).not.toHaveClass('g-disclosure__trigger_arrow-right');
expect(disclosure).not.toHaveClass('g-disclosure__trigger_arrow_end');
});
test('arrow on the right if arrowPosition=right', () => {
render(<Disclosure arrowPosition="right" />);
test('arrow on the end position if arrowPosition=end', () => {
render(<Disclosure arrowPosition="end" />);
const disclosure = screen.getByRole('button');

expect(disclosure).toHaveClass('g-disclosure__trigger_arrow-right');
expect(disclosure).toHaveClass('g-disclosure__trigger_arrow_end');
});
});
Loading