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

revert last two commits #1349

Merged
merged 1 commit into from
May 20, 2024
Merged

revert last two commits #1349

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
240 changes: 113 additions & 127 deletions vuu-ui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vuu-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"typecheck": "tsc --noEmit --project tsconfig-typecheck.json"
},
"dependencies": {
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@testing-library/react-hooks": "^8.0.1",
"@types/jest": "^29.5.11",
"@types/node": "^18.0.0",
Expand Down
1 change: 0 additions & 1 deletion vuu-ui/packages/vuu-data-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"@finos/vuu-filter-parser": "0.0.26",
"@finos/vuu-popups": "0.0.26",
"@finos/vuu-shell": "0.0.26",
"@finos/vuu-ui-controls": "0.0.26",
"@finos/vuu-utils": "0.0.26"
},
"peerDependencies": {
Expand Down
23 changes: 0 additions & 23 deletions vuu-ui/packages/vuu-data-react/src/data-editing/date-editing-utils.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vuu-ui/packages/vuu-data-react/src/data-editing/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vuu-ui/packages/vuu-data-react/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from "./data-editing";
export * from "./hooks";
14 changes: 4 additions & 10 deletions vuu-ui/packages/vuu-datatable/src/filter-table/FilterTable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
.vuuFilterTable {
--vuuFilterBar-flex: 0 0 33px;
--vuuMeasuredContainer-flex: 1 1 auto;
--vuuMeasuredContainer-height: auto;
display: flex;
flex-direction: column;

.vuuFilterBar {
flex: 0 0 auto;
}
}
--vuuFilterBar-flex: 0 0 33px;
display: flex;
flex-direction: column;
}
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-filters/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@finos/vuu-popups": "0.0.26",
"@finos/vuu-ui-controls": "0.0.26",
"@finos/vuu-utils": "0.0.26",
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1",
"uuid": "9.0.0"
Expand Down
14 changes: 6 additions & 8 deletions vuu-ui/packages/vuu-filters/src/filter-bar/FilterBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
--vuu-svg-grid: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M2 6.00004H4.66667V3.33337H3.33333C2.6 3.33337 2 3.93337 2 4.66671V6.00004ZM2 9.33337H4.66667V6.66671H2V9.33337ZM5.33333 9.33337H8V6.66671H5.33333V9.33337ZM8.66667 9.33337H11.3333V6.66671H8.66667V9.33337ZM5.33333 6.00004H8V3.33337H5.33333V6.00004ZM8.66667 3.33337V6.00004H11.3333V3.33337H8.66667ZM12 9.33337H14.6667V6.66671H12V9.33337ZM3.33333 12.6667H4.66667V10H2V11.3334C2 12.0667 2.6 12.6667 3.33333 12.6667ZM5.33333 12.6667H8V10H5.33333V12.6667ZM8.66667 12.6667H11.3333V10H8.66667V12.6667ZM12 12.6667H13.3333C14.0667 12.6667 14.6667 12.0667 14.6667 11.3334V10H12V12.6667ZM12 3.33337V6.00004H14.6667V4.66671C14.6667 3.93337 14.0667 3.33337 13.3333 3.33337H12Z"/></svg>');
--vuu-svg-tune: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3 18C3 18.55 3.45 19 4 19H9V17H4C3.45 17 3 17.45 3 18ZM3 6C3 6.55 3.45 7 4 7H13V5H4C3.45 5 3 5.45 3 6ZM13 20V19H20C20.55 19 21 18.55 21 18C21 17.45 20.55 17 20 17H13V16C13 15.45 12.55 15 12 15C11.45 15 11 15.45 11 16V20C11 20.55 11.45 21 12 21C12.55 21 13 20.55 13 20ZM7 10V11H4C3.45 11 3 11.45 3 12C3 12.55 3.45 13 4 13H7V14C7 14.55 7.45 15 8 15C8.55 15 9 14.55 9 14V10C9 9.45 8.55 9 8 9C7.45 9 7 9.45 7 10ZM21 12C21 11.45 20.55 11 20 11H11V13H20C20.55 13 21 12.55 21 12ZM16 9C16.55 9 17 8.55 17 8V7H20C20.55 7 21 6.55 21 6C21 5.45 20.55 5 20 5H17V4C17 3.45 16.55 3 16 3C15.45 3 15 3.45 15 4V8C15 8.55 15.45 9 16 9Z" /></svg>');
--vuuOverflowContainer-minWidth: 0;
--filterbar-height: var(
--vuuFilterBar-height,
calc(var(--salt-size-base) + var(--salt-spacing-100))
);
--filterbar-height: var(--vuuFilterBar-height, calc(var(--salt-size-base) + var(--salt-spacing-100)));
--vuuFilterEditor-height: var(--filterbar-height);
--flexbar-gap: var(--salt-spacing-100);

Expand All @@ -20,19 +17,20 @@
gap: var(--flexbar-gap);
grid-template-columns: 70px 1fr 28px;
grid-auto-rows: 28px 0px;
height: calc(var(--salt-spacing-100) + var(--filterbar-height));
height: calc(1px + var(--filterbar-height));
overflow: hidden;
padding: var(--salt-spacing-100) var(--salt-spacing-200);
padding: var(--salt-spacing-100) var(--salt-spacing-200) 0px var(--salt-spacing-200);

}

.vuuFilterBar-quick-filter {
align-items: flex-end;
padding: var(--salt-spacing-100) var(--salt-spacing-200);
}

.vuuFilterBar:has(.vuuFilterEditor) {
.vuuFilterBar:has(.vuuFilterEditor){
grid-template-rows: 28px 28px;
height: calc(1px + var(--flexbar-gap) + (2 * var(--filterbar-height)));
height: calc(1px + var(--flexbar-gap) + (2 * var(--filterbar-height))) ;
}

.vuuFilterbar-icon {
Expand Down
1 change: 0 additions & 1 deletion vuu-ui/packages/vuu-filters/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ export * from "./filter-clause";
export * from "./filter-editor";
export * from "./filter-pill";
export * from "./filter-utils";
export * from "./inline-filter";
export * from "./quick-filters";
export * from "./use-filter-config";
10 changes: 0 additions & 10 deletions vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.css
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vuu-ui/packages/vuu-filters/src/inline-filter/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-layout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@finos/vuu-filter-types": "0.0.26"
},
"dependencies": {
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1",
"@finos/vuu-data-types": "0.0.26",
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-popups/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"type-defs": "node ../../scripts/build-type-defs.mjs"
},
"dependencies": {
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1",
"@finos/vuu-data-types": "0.0.26",
Expand Down
32 changes: 10 additions & 22 deletions vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import {
Dialog,
DialogCloseButton,
DialogContent,
DialogHeader,
} from "@salt-ds/core";
import { ReactElement, useCallback, useState } from "react";
import { Dialog } from "./Dialog";

export type DialogState = {
content: ReactElement;
Expand All @@ -17,26 +12,19 @@ export type SetDialog = (dialogState?: DialogState) => void;
export const useDialog = () => {
const [dialogState, setDialogState] = useState<DialogState>();

const closeDialog = useCallback(() => {
const handleClose = useCallback(() => {
setDialogState(undefined);
}, []);

const handleOpenChange = useCallback(
(open?: boolean) => {
if (open !== true) {
closeDialog();
}
},
[closeDialog]
);

const dialog = dialogState ? (
<Dialog className="vuDialog" open={true} onOpenChange={handleOpenChange}>
<DialogHeader header={dialogState.title} />
<DialogContent>{dialogState.content}</DialogContent>
{dialogState.hideCloseButton !== true ? (
<DialogCloseButton onClick={closeDialog} />
) : null}
<Dialog
className="vuDialog"
isOpen={true}
onClose={handleClose}
title={dialogState.title}
hideCloseButton={dialogState.hideCloseButton}
>
{dialogState.content}
</Dialog>
) : null;

Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-shell/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@finos/vuu-table-types": "0.0.26"
},
"dependencies": {
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1",
"@finos/vuu-data-remote": "0.0.26",
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-table-extras/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@finos/vuu-utils": "0.0.26",
"@finos/vuu-ui-controls": "0.0.26",
"@lezer/lr": "1.3.4",
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-table/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@finos/vuu-protocol-types": "0.0.26"
},
"dependencies": {
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1",
"@finos/vuu-layout": "0.0.26",
Expand Down
5 changes: 3 additions & 2 deletions vuu-ui/packages/vuu-table/src/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { forwardRef, memo, MouseEvent, useCallback } from "react";
import { TableCell, TableGroupCell } from "./table-cell";

import rowCss from "./Row.css";
import { VirtualColSpan } from "./VirtualColSpan";

const { IDX, IS_EXPANDED, SELECTED } = metadataKeys;
const classBase = "vuuTableRow";
Expand Down Expand Up @@ -119,7 +118,9 @@ export const Row = memo(
style={style}
>
<span className={`${classBase}-selectionDecorator vuuStickyLeft`} />
<VirtualColSpan width={virtualColSpan} />
{virtualColSpan > 0 ? (
<div className="vuuTableCell" style={{ width: virtualColSpan }} />
) : null}
{columns.filter(isNotHidden).map((column) => {
const isGroup = isGroupColumn(column);
const isJsonCell = isJsonColumn(column);
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-table/src/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ const TableCore = ({
"--pinned-width-left": `${viewportMeasurements.pinnedWidthLeft}px`,
"--pinned-width-right": `${viewportMeasurements.pinnedWidthRight}px`,
"--row-height-prop": `${rowHeight}px`,
"--total-header-height": `${headerHeight}px`,
"--total-header-height": `${viewportMeasurements.totalHeaderHeight}px`,
"--vertical-scrollbar-width": `${viewportMeasurements.verticalScrollbarWidth}px`,
"--viewport-body-height": `${viewportMeasurements.viewportBodyHeight}px`,
} as CSSProperties;
Expand Down
14 changes: 0 additions & 14 deletions vuu-ui/packages/vuu-table/src/VirtualColSpan.tsx
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions vuu-ui/packages/vuu-table/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from "./bulk-edit";
export * from "./cell-renderers";
export * from "./header-cell";
export * from "./cell-renderers";
export * from "./header-cell";
export * from "./Table";
export * from "./table-cell";
Expand All @@ -10,4 +9,4 @@ export * from "./useControlledTableNavigation";
export * from "./useTableModel";
export * from "./useTableScroll";
export * from "./useTableViewport";
export * from "./VirtualColSpan";
export * from "./bulk-edit";
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-table/src/table-header/TableHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ export const TableHeader = memo(
/>
)
)}
{customHeaders}
{draggableColumn}
</div>
{customHeaders}
</div>
);
}
Expand Down
23 changes: 10 additions & 13 deletions vuu-ui/packages/vuu-theme/css/components/filters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
.salt-theme.vuu-theme {
/* .vuuFilterBar {
--vuuFilterBar-height: 32px;
}
.vuuFilterBar:has(.vuuFilterEditor) {
--vuuFilterBar-height: 64px;
} */
/* .vuuFilterBar-quick-filter {
--vuuFilterBar-height: 50px;
} */
.vuuFilterPill {
--vuuSplitButton-borderRadius: var(--salt-size-base);
}
}
.vuuFilterBar {
--vuuFilterBar-height: 32px;
};
.vuuFilterBar-quick-filter {
--vuuFilterBar-height: 50px;
};
.vuuFilterPill {
--vuuSplitButton-borderRadius: var(--salt-size-base);
}
}
2 changes: 1 addition & 1 deletion vuu-ui/packages/vuu-ui-controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@finos/vuu-popups": "0.0.26",
"@finos/vuu-table": "0.0.26",
"@finos/vuu-utils": "0.0.26",
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@salt-ds/icons": "1.9.1",
"@salt-ds/styles": "0.2.1",
"@salt-ds/window": "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion vuu-ui/sample-apps/app-vuu-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {},
"dependencies": {
"@fontsource/open-sans": "^4.5.13",
"@salt-ds/core": "1.27.1",
"@salt-ds/core": "1.22.0",
"@finos/vuu-data-local": "0.0.26",
"@finos/vuu-data-remote": "0.0.26",
"@finos/vuu-table-types": "0.0.26",
Expand Down
Loading
Loading