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.

Sign up for GitHub

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

Jump to bottom

fix styling of main tabs during drag #929

Merged
merged 1 commit into from
Oct 24, 2023
Merged

fix styling of main tabs during drag #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion vuu-ui/packages/vuu-layout/src/layout-persistence/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ export const defaultLayout: LayoutJSON = {
className: "vuuShell-mainTabs",
TabstripProps: {
allowAddTab: true,
allowCloseTab: true,
allowRenameTab: true,
animateSelectionThumb: false,
location: "main-tab",
allowCloseTab: true
tabClassName: "MainTab",
},
preserve: true,
active: 0,
Expand Down
3 changes: 2 additions & 1 deletion vuu-ui/packages/vuu-layout/src/stack/Stack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const DefaultTabstripProps: Partial<TabstripProps> = {

export const Stack = forwardRef(function Stack(
{
TabstripProps = DefaultTabstripProps,
active = 0,
children,
className: classNameProp,
Expand All @@ -62,7 +63,6 @@ export const Stack = forwardRef(function Stack(
onTabSelectionChanged,
showTabs = "top",
style,
TabstripProps = DefaultTabstripProps,
}: StackProps,
ref: ForwardedRef<HTMLDivElement>
) {
Expand All @@ -71,6 +71,7 @@ export const Stack = forwardRef(function Stack(
allowCloseTab,
allowRenameTab,
className: tabstripClassName,
tabClassName,
} = TabstripProps;

const handleExitEditMode = useCallback(
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-ui-controls/src/tabstrip/Tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const Tab = forwardRef(function Tab(
{...props}
aria-controls={ariaControls}
aria-selected={selected}
className={cx(classBase, {
className={cx(classBase, className, {
[`${classBase}-closeable`]: closeable,
"vuuDraggable-dragAway": dragging,
[`${classBase}-editing`]: editing,
Expand Down
4 changes: 4 additions & 0 deletions vuu-ui/packages/vuu-ui-controls/src/tabstrip/TabsTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ export interface TabstripProps extends HTMLAttributes<HTMLDivElement> {
* not closeable, not renameable and has no tab-location , otherwise true.
*/
showTabMenuButton?: boolean;
/**
* An optional classname that will be added to each tab
*/
tabClassName?: string;
}

export type exitEditHandler = (
Expand Down
2 changes: 2 additions & 0 deletions vuu-ui/packages/vuu-ui-controls/src/tabstrip/Tabstrip.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@
}

.vuuDraggable-tabstrip-horizontal {
--item-height: var(--tabstrip-height);
--tab-thumb-height: 2px;
--tab-thumb-left: 0px;
--tabstrip-display: inline-flex;
--tabstrip-height: 28px;
line-height: var(--tabstrip-height);
}
Expand Down
19 changes: 11 additions & 8 deletions vuu-ui/packages/vuu-ui-controls/src/tabstrip/Tabstrip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const Tabstrip = ({
orientation = "horizontal",
showTabMenuButton,
style: styleProp,
tabClassName,
...htmlAttributes
}: TabstripProps) => {
const rootRef = useRef<HTMLDivElement>(null);
Expand All @@ -53,7 +54,6 @@ export const Tabstrip = ({
onMoveTab,
orientation,
});

const id = useId(idProp);
const className = cx(classBase, `${classBase}-${orientation}`, classNameProp);
const style =
Expand All @@ -70,6 +70,7 @@ export const Tabstrip = ({
.map((child, index) => {
const {
id: tabId = `${id}-tab-${index}`,
className,
closeable = allowCloseTab,
editable = allowRenameTab,
location: tabLocation,
Expand All @@ -79,6 +80,7 @@ export const Tabstrip = ({
return React.cloneElement(child, {
...tabProps,
...tabstripHook.navigationProps,
className: cx(className, tabClassName),
closeable,
"data-overflow-priority": selected ? "1" : undefined,
dragging: draggedItemIndex === index,
Expand Down Expand Up @@ -111,19 +113,20 @@ export const Tabstrip = ({
)
),
[
activeTabIndex,
children,
allowAddTab,
tabstripHook.navigationProps,
onClickAddTab,
id,
allowCloseTab,
allowRenameTab,
children,
focusVisible,
id,
location,
onClickAddTab,
showTabMenuButton,
activeTabIndex,
tabProps,
tabClassName,
draggedItemIndex,
tabstripHook.navigationProps,
focusVisible,
location,
]
);

Expand Down
13 changes: 7 additions & 6 deletions vuu-ui/sample-apps/app-vuu-basket-trader/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,23 @@ body {
z-index: 1;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab {
background-color: var(--vuu-color-gray-28);
.MainTab {
background-color: #F1F2F4;
border-color: #D6D7DA;
border-radius: 6px 6px 0 0;
border-width: 1px;
border-style: solid;
position: relative;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-selected {
.MainTab.vuuTab-selected {
background-color: white;
border-bottom-color: white;
z-index: 1;

}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-selected:before{
.MainTab.vuuTab-selected:before{
background-color: #6d188b;;
content: '';
position: absolute;
Expand All @@ -137,7 +138,7 @@ body {
width: 6px;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab:hover:not(.vuuTab-selected):before{
.MainTab.vuuTab:hover:not(.vuuTab-selected):before{
background-color: #F37880;
content: '';
position: absolute;
Expand All @@ -148,7 +149,7 @@ body {
width: 6px;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-main {
.MainTab .vuuTab-main {
background-color: transparent;
font-weight: 700;
height: 29px;
Expand Down
24 changes: 0 additions & 24 deletions vuu-ui/sample-apps/app-vuu-basket-trader/src/defaultLayout.ts
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions vuu-ui/showcase/src/examples/Apps/NewTheme.examples.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ body {

}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab {
.MainTab {
background-color: #F1F2F4;
border-color: #D6D7DA;
border-radius: 6px 6px 0 0;
Expand All @@ -60,14 +60,14 @@ body {
position: relative;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-selected {
.MainTab.vuuTab-selected {
background-color: white;
border-bottom-color: white;
z-index: 1;

}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-selected:before{
.MainTab.vuuTab-selected:before{
background-color: #6d188b;;
content: '';
position: absolute;
Expand All @@ -78,7 +78,7 @@ body {
width: 6px;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab:hover:not(.vuuTab-selected):before{
.MainTab.vuuTab:hover:not(.vuuTab-selected):before{
background-color: #F37880;
content: '';
position: absolute;
Expand All @@ -89,7 +89,7 @@ body {
width: 6px;
}

.vuuShell-mainTabs > .vuuTabstrip .vuuTab-main {
.MainTab .vuuTab-main {
background-color: transparent;
font-weight: 700;
height: 29px;
Expand Down
Loading