Skip to content

Commit

Permalink
fix(html): fix toolbar scrolling position
Browse files Browse the repository at this point in the history
  • Loading branch information
TeyaVes committed Jan 23, 2025
1 parent 334e3ee commit e8459c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/html/src/toolbar/tests/toolbar-fill-modes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default () =>(
</section>
<span className="k-colspan-all k-col-span-full">{fillMode} with overlay</span>
<section className="k-colspan-all k-col-span-full">
<ToolbarScrollableButtonsHidden fillMode={fillMode}>
<ToolbarScrollableButtonsHidden scrollingPosition="both" fillMode={fillMode}>
<Button icon="arrow-rotate-ccw" fillMode={fillMode}></Button>
<Button icon="arrow-rotate-cw" fillMode={fillMode}></Button>
<ToolbarSeparator></ToolbarSeparator>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ export default () =>(

<span className="k-colspan-all k-col-span-full">Toolbar Hidden Buttons Scroll Middle</span>
<section className="k-colspan-all k-col-span-full">
<ToolbarScrollableButtonsHidden scrollingPosition={null} />
<ToolbarScrollableButtonsHidden scrollingPosition="both" />
</section>

<span className="k-colspan-all k-col-span-full">Toolbar Hidden Buttons Scroll Middle RTL</span>
<section className="k-colspan-all k-col-span-full" dir="rtl">
<ToolbarScrollableButtonsHidden scrollingPosition={null} />
<ToolbarScrollableButtonsHidden scrollingPosition="both" />
</section>

</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/toolbar/toolbar.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export type KendoToolbarProps = KendoToolbarOptions & {
resizable?: boolean;
scrollable?: boolean;
scrollButtons?: 'hidden' | 'start' | 'end' | 'around';
scrollingPosition?: 'start' | 'end';
scrollingPosition?: 'start' | 'end' | 'both';
section?: boolean;
};

Expand Down Expand Up @@ -192,7 +192,7 @@ export const Toolbar = (
[`${TOOLBAR_CLASSNAME}-resizable`]: resizable,
[`${TOOLBAR_CLASSNAME}-scrollable`]: scrollable,
[`${TOOLBAR_CLASSNAME}-scrollable-overlay`]: (scrollable && scrollButtons === 'hidden'),
[`${TOOLBAR_CLASSNAME}-scrollable-${scrollingPosition}`]: scrollingPosition,
[`${TOOLBAR_CLASSNAME}-scrollable-${scrollingPosition}`]: scrollingPosition && scrollingPosition !== 'both',
[`${TOOLBAR_CLASSNAME}-section`]: section,
}
)}
Expand Down

0 comments on commit e8459c0

Please sign in to comment.