feat: Refactor Tabs component to use new styling utilities and tokens #3119
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,24 +1,22 @@ | ||||||
| import * as React from 'react'; | ||||||
|
|
||||||
| import { | ||||||
| composeHooks, | ||||||
| createSubcomponent, | ||||||
| createElemPropsHook, | ||||||
| ExtractProps, | ||||||
| useModalityType, | ||||||
| } from '@workday/canvas-kit-react/common'; | ||||||
| import {Flex, mergeStyles} from '@workday/canvas-kit-react/layout'; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| import { | ||||||
| useOverflowListMeasure, | ||||||
| useListRenderItems, | ||||||
| useListResetCursorOnBlur, | ||||||
| } from '@workday/canvas-kit-react/collection'; | ||||||
|
|
||||||
| import {useTabsModel} from './useTabsModel'; | ||||||
| import {createStencil} from '@workday/canvas-kit-styling'; | ||||||
| import {system} from '@workday/canvas-tokens-web'; | ||||||
|
|
||||||
| export interface TabListProps<T = any> extends Omit<ExtractProps<typeof Flex, never>, 'children'> { | ||||||
| /** | ||||||
|
|
@@ -46,44 +44,90 @@ export const useTabsList = composeHooks( | |||||
| useListResetCursorOnBlur | ||||||
| ); | ||||||
|
|
||||||
| const tabsListStencil = createStencil({ | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. this line can probably be added to the stencil instead; https://github.com/Workday/canvas-kit/pull/3119/files#diff-5e3729c5f87ee54b9d212a45937aac7b46d5314877e6b5b1e8182b7d55a5901dL42 We should remove styles in model hooks so the css makes sense. |
||||||
| base: { | ||||||
| display: 'flex', | ||||||
| position: 'relative', | ||||||
| borderBottom: `1px solid ${system.color.border.divider}`, | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| gap: system.space.x2, | ||||||
| paddingInline: system.space.x6, | ||||||
| maskImage: 'none', | ||||||
| }, | ||||||
| modifiers: { | ||||||
| modality: { | ||||||
| touch: { | ||||||
| paddingInline: system.space.zero, | ||||||
| }, | ||||||
| mouse: {}, | ||||||
| pen: {}, | ||||||
| }, | ||||||
| isDragging: { | ||||||
| true: {}, | ||||||
| false: {}, | ||||||
| }, | ||||||
| direction: { | ||||||
| left: {}, | ||||||
| right: {}, | ||||||
| }, | ||||||
| currentScrollPos: { | ||||||
| true: {}, | ||||||
| false: {}, | ||||||
| }, | ||||||
| }, | ||||||
| compound: [ | ||||||
| { | ||||||
| modifiers: { | ||||||
| modality: 'touch', | ||||||
| isDragging: true, | ||||||
| direction: 'left', | ||||||
| }, | ||||||
| styles: { | ||||||
| maskImage: 'linear-gradient(to left, white 80%, transparent)', | ||||||
| }, | ||||||
| }, | ||||||
| { | ||||||
| modifiers: { | ||||||
| modality: 'touch', | ||||||
| isDragging: true, | ||||||
| direction: 'right', | ||||||
| }, | ||||||
| styles: { | ||||||
| maskImage: 'linear-gradient(to right, white 80%, transparent)', | ||||||
| }, | ||||||
| }, | ||||||
| ], | ||||||
| }); | ||||||
|
|
||||||
| export const TabsList = createSubcomponent('div')({ | ||||||
| displayName: 'Tabs.List', | ||||||
| modelHook: useTabsModel, | ||||||
| elemPropsHook: useTabsList, | ||||||
| })<TabListProps & {maskImage?: string}>( | ||||||
| ({children, overflowButton, ...elemProps}, Element, model) => { | ||||||
| const modality = useModalityType(); | ||||||
| const touchStates = useTouchDirection(); | ||||||
|
|
||||||
| return ( | ||||||
| <Element | ||||||
| {...mergeStyles( | ||||||
| elemProps, | ||||||
| tabsListStencil({ | ||||||
| modality: modality, | ||||||
| isDragging: touchStates.isDragging, | ||||||
| direction: touchStates.direction, | ||||||
| }) | ||||||
| )} | ||||||
| > | ||||||
| {useListRenderItems(model, children)} | ||||||
| {overflowButton} | ||||||
| </Element> | ||||||
| ); | ||||||
| } | ||||||
| ); | ||||||
|
|
||||||
| export const useTouchDirection = () => { | ||||||
| const [isDragging, setIsDragging] = React.useState(false); | ||||||
| const [touchDir, setTouchDirection] = React.useState<'right' | 'left' | undefined>('right'); | ||||||
|
|
||||||
| React.useEffect(() => { | ||||||
| let prevXPos = window.pageXOffset; | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should extend
buttonStencil.