diff --git a/vuu-ui/package-lock.json b/vuu-ui/package-lock.json index 1433e340b..cbf9b4836 100644 --- a/vuu-ui/package-lock.json +++ b/vuu-ui/package-lock.json @@ -17,7 +17,7 @@ "themes/**" ], "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", @@ -1285,52 +1285,31 @@ "link": true }, "node_modules/@floating-ui/core": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz", - "integrity": "sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", + "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", "dependencies": { - "@floating-ui/utils": "^0.2.0" + "@floating-ui/utils": "^0.1.1" } }, "node_modules/@floating-ui/dom": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz", - "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", "dependencies": { "@floating-ui/core": "^1.0.0", "@floating-ui/utils": "^0.2.0" } }, - "node_modules/@floating-ui/react": { - "version": "0.26.15", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.15.tgz", - "integrity": "sha512-WKmfLkxTwCm09Dxq4LpjL3EPbZVSp5wvnap1jmculsfnzg2Ag/pCkP+OPyjE5dFMXqX97hsLIqJehboZ5XAHXw==", - "dependencies": { - "@floating-ui/react-dom": "^2.0.0", - "@floating-ui/utils": "^0.2.0", - "tabbable": "^6.0.0" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@floating-ui/react-dom": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.9.tgz", - "integrity": "sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==", - "dependencies": { - "@floating-ui/dom": "^1.0.0" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } + "node_modules/@floating-ui/dom/node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" }, "node_modules/@floating-ui/utils": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz", - "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==" + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", + "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" }, "node_modules/@fontsource/open-sans": { "version": "4.5.14", @@ -2062,12 +2041,12 @@ ] }, "node_modules/@salt-ds/core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@salt-ds/core/-/core-1.27.1.tgz", - "integrity": "sha512-9lAJc/6i3phrWm4Vgag7rvv6jVmmbOchJeDP82/LKxd0WrhVT6RflsB4XMH+3xIUsE2ggu1H2+G+zLFqRIOFDA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/@salt-ds/core/-/core-1.22.0.tgz", + "integrity": "sha512-JKriQ9hZaSyw+j6WwiqzjJ2vIXBUUxEbS1bp0hqfi/sW8pAN+MFaeCCrAI1PuvEcrsr6ishaPaORZJkTocMIcg==", "dependencies": { "@floating-ui/react": "^0.26.5", - "@salt-ds/icons": "^1.11.2", + "@salt-ds/icons": "^1.9.1", "@salt-ds/styles": "^0.2.1", "@salt-ds/window": "^0.1.1", "clsx": "^2.0.0" @@ -2083,26 +2062,37 @@ } } }, - "node_modules/@salt-ds/core/node_modules/@salt-ds/icons": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@salt-ds/icons/-/icons-1.11.2.tgz", - "integrity": "sha512-2q2zORJT41HqA/LK0LdNKJjdueMNJAdz6693oQP95C8j2VWE1MtaHMot7fEJTWXQz2DHs7Mrwkx3/pqHJP3BcA==", + "node_modules/@salt-ds/core/node_modules/@floating-ui/react": { + "version": "0.26.9", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.9.tgz", + "integrity": "sha512-p86wynZJVEkEq2BBjY/8p2g3biQ6TlgT4o/3KgFKyTWoJLU1GZ8wpctwRqtkEl2tseYA+kw7dBAIDFcednfI5w==", "dependencies": { - "@salt-ds/styles": "^0.2.1", - "@salt-ds/window": "^0.1.1", - "clsx": "^2.0.0" + "@floating-ui/react-dom": "^2.0.8", + "@floating-ui/utils": "^0.2.1", + "tabbable": "^6.0.1" }, "peerDependencies": { - "@types/react": ">=16.14.0", - "react": ">=16.14.0", - "react-dom": ">=16.14.0" + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@salt-ds/core/node_modules/@floating-ui/react-dom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", + "dependencies": { + "@floating-ui/dom": "^1.6.1" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" } }, + "node_modules/@salt-ds/core/node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, "node_modules/@salt-ds/icons": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@salt-ds/icons/-/icons-1.9.1.tgz", @@ -13470,7 +13460,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" @@ -13516,7 +13506,7 @@ "@finos/vuu-table": "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" }, @@ -13539,7 +13529,7 @@ "@finos/vuu-layout": "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" }, @@ -13566,7 +13556,7 @@ "@finos/vuu-table": "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", "html-to-image": "^1.11.11" @@ -13614,7 +13604,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" }, @@ -13644,7 +13634,7 @@ "@finos/vuu-ui-controls": "0.0.26", "@finos/vuu-utils": "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" }, @@ -13670,8 +13660,6 @@ "version": "0.0.26", "license": "Apache-2.0", "devDependencies": { - "@finos/vuu-data-types": "0.0.26", - "@finos/vuu-filter-types": "0.0.26", "@finos/vuu-protocol-types": "0.0.26" } }, @@ -13689,7 +13677,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" @@ -13736,7 +13724,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-utils": "0.0.26", "@fontsource/open-sans": "^4.5.13", - "@salt-ds/core": "1.27.1", + "@salt-ds/core": "1.22.0", "clsx": "^2.0.0", "react": ">=17.0.2", "react-dom": ">=17.0.2" @@ -13760,7 +13748,7 @@ "@finos/vuu-table-extras": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "devDependencies": { "@finos/vuu-data-types": "0.0.26", @@ -13795,7 +13783,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "devDependencies": {}, "engines": { @@ -13825,7 +13813,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "devDependencies": {}, "engines": { @@ -13855,7 +13843,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "devDependencies": {}, "engines": { @@ -13899,9 +13887,8 @@ "@finos/vuu-showcase": "0.0.1", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@floating-ui/react": "^0.26.5", "@internationalized/date": "^3.0.0", - "@salt-ds/core": "1.27.1", + "@salt-ds/core": "1.22.0", "@salt-ds/theme": "1.13.1", "clsx": "^2.0.0", "react": ">=17.0.2", @@ -13955,7 +13942,7 @@ "@finos/vuu-theme": "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/theme": "1.13.1" }, "devDependencies": {}, @@ -14662,13 +14649,12 @@ "@finos/vuu-showcase": "0.0.1", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@floating-ui/react": "^0.26.5", "@internationalized/date": "^3.0.0", "@mdx-js/esbuild": "^3.0.1", "@mdx-js/rollup": "3.0.0", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", - "@salt-ds/core": "1.27.1", + "@salt-ds/core": "1.22.0", "@salt-ds/theme": "1.13.1", "clsx": "^2.0.0", "react": ">=17.0.2", @@ -14804,7 +14790,7 @@ "@finos/vuu-table-types": "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", "@types/uuid": "^9.0.2", @@ -14830,7 +14816,7 @@ "@finos/vuu-table": "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" } @@ -14842,7 +14828,7 @@ "@finos/vuu-layout": "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" } @@ -14863,7 +14849,7 @@ "@finos/vuu-table-types": "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", "html-to-image": "^1.11.11" @@ -14877,7 +14863,7 @@ "@finos/vuu-theme": "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/theme": "1.13.1" }, "dependencies": { @@ -14898,7 +14884,7 @@ "@finos/vuu-table-types": "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" } @@ -14918,7 +14904,7 @@ "@finos/vuu-ui-controls": "0.0.26", "@finos/vuu-utils": "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" }, @@ -14934,8 +14920,6 @@ "@finos/vuu-table-types": { "version": "file:packages/vuu-table-types", "requires": { - "@finos/vuu-data-types": "0.0.26", - "@finos/vuu-filter-types": "0.0.26", "@finos/vuu-protocol-types": "0.0.26" } }, @@ -14951,7 +14935,7 @@ "@finos/vuu-table": "0.0.26", "@finos/vuu-table-types": "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" @@ -14967,44 +14951,33 @@ } }, "@floating-ui/core": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz", - "integrity": "sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", + "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", "requires": { - "@floating-ui/utils": "^0.2.0" + "@floating-ui/utils": "^0.1.1" } }, "@floating-ui/dom": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz", - "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", "requires": { "@floating-ui/core": "^1.0.0", "@floating-ui/utils": "^0.2.0" - } - }, - "@floating-ui/react": { - "version": "0.26.15", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.15.tgz", - "integrity": "sha512-WKmfLkxTwCm09Dxq4LpjL3EPbZVSp5wvnap1jmculsfnzg2Ag/pCkP+OPyjE5dFMXqX97hsLIqJehboZ5XAHXw==", - "requires": { - "@floating-ui/react-dom": "^2.0.0", - "@floating-ui/utils": "^0.2.0", - "tabbable": "^6.0.0" - } - }, - "@floating-ui/react-dom": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.9.tgz", - "integrity": "sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==", - "requires": { - "@floating-ui/dom": "^1.0.0" + }, + "dependencies": { + "@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + } } }, "@floating-ui/utils": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz", - "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==" + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", + "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" }, "@fontsource/open-sans": { "version": "4.5.14", @@ -15501,26 +15474,39 @@ "optional": true }, "@salt-ds/core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@salt-ds/core/-/core-1.27.1.tgz", - "integrity": "sha512-9lAJc/6i3phrWm4Vgag7rvv6jVmmbOchJeDP82/LKxd0WrhVT6RflsB4XMH+3xIUsE2ggu1H2+G+zLFqRIOFDA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/@salt-ds/core/-/core-1.22.0.tgz", + "integrity": "sha512-JKriQ9hZaSyw+j6WwiqzjJ2vIXBUUxEbS1bp0hqfi/sW8pAN+MFaeCCrAI1PuvEcrsr6ishaPaORZJkTocMIcg==", "requires": { "@floating-ui/react": "^0.26.5", - "@salt-ds/icons": "^1.11.2", + "@salt-ds/icons": "^1.9.1", "@salt-ds/styles": "^0.2.1", "@salt-ds/window": "^0.1.1", "clsx": "^2.0.0" }, "dependencies": { - "@salt-ds/icons": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@salt-ds/icons/-/icons-1.11.2.tgz", - "integrity": "sha512-2q2zORJT41HqA/LK0LdNKJjdueMNJAdz6693oQP95C8j2VWE1MtaHMot7fEJTWXQz2DHs7Mrwkx3/pqHJP3BcA==", + "@floating-ui/react": { + "version": "0.26.9", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.9.tgz", + "integrity": "sha512-p86wynZJVEkEq2BBjY/8p2g3biQ6TlgT4o/3KgFKyTWoJLU1GZ8wpctwRqtkEl2tseYA+kw7dBAIDFcednfI5w==", "requires": { - "@salt-ds/styles": "^0.2.1", - "@salt-ds/window": "^0.1.1", - "clsx": "^2.0.0" + "@floating-ui/react-dom": "^2.0.8", + "@floating-ui/utils": "^0.2.1", + "tabbable": "^6.0.1" } + }, + "@floating-ui/react-dom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", + "requires": { + "@floating-ui/dom": "^1.6.1" + } + }, + "@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" } } }, @@ -16395,7 +16381,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-utils": "0.0.26", "@fontsource/open-sans": "^4.5.13", - "@salt-ds/core": "1.27.1", + "@salt-ds/core": "1.22.0", "clsx": "^2.0.0", "react": ">=17.0.2", "react-dom": ">=17.0.2" @@ -18344,7 +18330,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" } }, "feature-vuu-filter-table": { @@ -18363,7 +18349,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" } }, "feature-vuu-instrument-tiles": { @@ -18382,7 +18368,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" } }, "feature-vuu-template": { @@ -18401,7 +18387,7 @@ "@finos/vuu-table-types": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" } }, "figures": { diff --git a/vuu-ui/package.json b/vuu-ui/package.json index 74568aa5a..52c7143ad 100644 --- a/vuu-ui/package.json +++ b/vuu-ui/package.json @@ -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", diff --git a/vuu-ui/packages/vuu-data-react/package.json b/vuu-ui/packages/vuu-data-react/package.json index f3d8f62eb..a76d2ed4e 100644 --- a/vuu-ui/packages/vuu-data-react/package.json +++ b/vuu-ui/packages/vuu-data-react/package.json @@ -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": { diff --git a/vuu-ui/packages/vuu-data-react/src/data-editing/date-editing-utils.tsx b/vuu-ui/packages/vuu-data-react/src/data-editing/date-editing-utils.tsx deleted file mode 100644 index 420c05746..000000000 --- a/vuu-ui/packages/vuu-data-react/src/data-editing/date-editing-utils.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { ColumnDescriptor } from "@finos/vuu-table-types"; -import { Commithandler, VuuInput } from "@finos/vuu-ui-controls"; - -export interface DataItemEditControlProps { - column: ColumnDescriptor; - onCommit: Commithandler; -} - -export const getDataItemEditControl = ({ - column, - onCommit, -}: DataItemEditControlProps) => { - switch (column.serverDataType) { - default: - return ( - - ); - } -}; diff --git a/vuu-ui/packages/vuu-data-react/src/data-editing/index.ts b/vuu-ui/packages/vuu-data-react/src/data-editing/index.ts deleted file mode 100644 index 3f2d08aeb..000000000 --- a/vuu-ui/packages/vuu-data-react/src/data-editing/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./date-editing-utils"; diff --git a/vuu-ui/packages/vuu-data-react/src/index.ts b/vuu-ui/packages/vuu-data-react/src/index.ts index 16ba2506f..007f69d09 100644 --- a/vuu-ui/packages/vuu-data-react/src/index.ts +++ b/vuu-ui/packages/vuu-data-react/src/index.ts @@ -1,2 +1 @@ -export * from "./data-editing"; export * from "./hooks"; diff --git a/vuu-ui/packages/vuu-datatable/src/filter-table/FilterTable.css b/vuu-ui/packages/vuu-datatable/src/filter-table/FilterTable.css index 9becb11be..55ae31733 100644 --- a/vuu-ui/packages/vuu-datatable/src/filter-table/FilterTable.css +++ b/vuu-ui/packages/vuu-datatable/src/filter-table/FilterTable.css @@ -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; +} \ No newline at end of file diff --git a/vuu-ui/packages/vuu-filters/package.json b/vuu-ui/packages/vuu-filters/package.json index 22d1cd4d4..461d1556b 100644 --- a/vuu-ui/packages/vuu-filters/package.json +++ b/vuu-ui/packages/vuu-filters/package.json @@ -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" diff --git a/vuu-ui/packages/vuu-filters/src/filter-bar/FilterBar.css b/vuu-ui/packages/vuu-filters/src/filter-bar/FilterBar.css index e77575267..b7ca58c0b 100644 --- a/vuu-ui/packages/vuu-filters/src/filter-bar/FilterBar.css +++ b/vuu-ui/packages/vuu-filters/src/filter-bar/FilterBar.css @@ -2,10 +2,7 @@ --vuu-svg-grid: url('data:image/svg+xml;utf8,'); --vuu-svg-tune: url('data:image/svg+xml;utf8,'); --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); @@ -20,9 +17,10 @@ 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 { @@ -30,9 +28,9 @@ 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 { diff --git a/vuu-ui/packages/vuu-filters/src/index.ts b/vuu-ui/packages/vuu-filters/src/index.ts index 9ad3ad984..5711ca5b9 100644 --- a/vuu-ui/packages/vuu-filters/src/index.ts +++ b/vuu-ui/packages/vuu-filters/src/index.ts @@ -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"; diff --git a/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.css b/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.css deleted file mode 100644 index e2b27f8ea..000000000 --- a/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.css +++ /dev/null @@ -1,10 +0,0 @@ -.vuuInlineFilter { - .vuuInlineFilter-filter { - display: inline-block; - padding: 1px; - } - - .vuuInlineFilter-virtualColSpan { - display: inline-block; - } -} diff --git a/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.tsx b/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.tsx deleted file mode 100644 index 616bb0df3..000000000 --- a/vuu-ui/packages/vuu-filters/src/inline-filter/InlineFilter.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import { getDataItemEditControl } from "@finos/vuu-data-react"; -import { VirtualColSpan, useHeaderProps } from "@finos/vuu-table"; -import { Commithandler } from "@finos/vuu-ui-controls"; -import { queryClosest } from "@finos/vuu-utils"; -import { useComponentCssInjection } from "@salt-ds/styles"; -import { useWindow } from "@salt-ds/window"; -import { HTMLAttributes, useCallback } from "react"; - -import inlineFilteCss from "./InlineFilter.css"; -import { ColumnDescriptor } from "packages/vuu-table-types"; - -const classBase = "vuuInlineFilter"; - -export type FilterValueChangeHandler = ( - column: ColumnDescriptor, - value: string -) => void; -export interface InlineFilterProps - extends Omit, "onChange"> { - onChange: FilterValueChangeHandler; -} - -export const InlineFilter = ({ - onChange, - ...htmlAttributes -}: InlineFilterProps) => { - const targetWindow = useWindow(); - useComponentCssInjection({ - testId: "vuu-inline-filter", - css: inlineFilteCss, - window: targetWindow, - }); - - const { columns, virtualColSpan = 0 } = useHeaderProps(); - - const onCommit = useCallback( - (evt, value) => { - const field = queryClosest(evt.target, "[data-field]"); - if (field) { - const columnName = field.dataset.field; - const column = columns.find((c) => c.name === columnName); - if (column) { - onChange(column, value); - } - } - }, - [columns, onChange] - ); - - return ( -
- - {columns.map((column) => ( -
- {getDataItemEditControl({ column, onCommit })} -
- ))} -
- ); -}; diff --git a/vuu-ui/packages/vuu-filters/src/inline-filter/index.ts b/vuu-ui/packages/vuu-filters/src/inline-filter/index.ts deleted file mode 100644 index 55f904a7f..000000000 --- a/vuu-ui/packages/vuu-filters/src/inline-filter/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./InlineFilter"; diff --git a/vuu-ui/packages/vuu-layout/package.json b/vuu-ui/packages/vuu-layout/package.json index 8d39e8fa9..1bbadeda2 100644 --- a/vuu-ui/packages/vuu-layout/package.json +++ b/vuu-ui/packages/vuu-layout/package.json @@ -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", diff --git a/vuu-ui/packages/vuu-popups/package.json b/vuu-ui/packages/vuu-popups/package.json index 1adf18184..56ee05d57 100644 --- a/vuu-ui/packages/vuu-popups/package.json +++ b/vuu-ui/packages/vuu-popups/package.json @@ -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", diff --git a/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx b/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx index a31b51278..55d170c74 100644 --- a/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx +++ b/vuu-ui/packages/vuu-popups/src/dialog/useDialog.tsx @@ -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; @@ -17,26 +12,19 @@ export type SetDialog = (dialogState?: DialogState) => void; export const useDialog = () => { const [dialogState, setDialogState] = useState(); - const closeDialog = useCallback(() => { + const handleClose = useCallback(() => { setDialogState(undefined); }, []); - const handleOpenChange = useCallback( - (open?: boolean) => { - if (open !== true) { - closeDialog(); - } - }, - [closeDialog] - ); - const dialog = dialogState ? ( - - - {dialogState.content} - {dialogState.hideCloseButton !== true ? ( - - ) : null} + + {dialogState.content} ) : null; diff --git a/vuu-ui/packages/vuu-shell/package.json b/vuu-ui/packages/vuu-shell/package.json index 9ad410812..a7ab30113 100644 --- a/vuu-ui/packages/vuu-shell/package.json +++ b/vuu-ui/packages/vuu-shell/package.json @@ -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", diff --git a/vuu-ui/packages/vuu-table-extras/package.json b/vuu-ui/packages/vuu-table-extras/package.json index ea078b948..bf513d183 100644 --- a/vuu-ui/packages/vuu-table-extras/package.json +++ b/vuu-ui/packages/vuu-table-extras/package.json @@ -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" }, diff --git a/vuu-ui/packages/vuu-table/package.json b/vuu-ui/packages/vuu-table/package.json index 6e0c94166..0d791c2f6 100644 --- a/vuu-ui/packages/vuu-table/package.json +++ b/vuu-ui/packages/vuu-table/package.json @@ -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", diff --git a/vuu-ui/packages/vuu-table/src/Row.tsx b/vuu-ui/packages/vuu-table/src/Row.tsx index 5a7a71bfd..005b7e609 100644 --- a/vuu-ui/packages/vuu-table/src/Row.tsx +++ b/vuu-ui/packages/vuu-table/src/Row.tsx @@ -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"; @@ -119,7 +118,9 @@ export const Row = memo( style={style} > - + {virtualColSpan > 0 ? ( +
+ ) : null} {columns.filter(isNotHidden).map((column) => { const isGroup = isGroupColumn(column); const isJsonCell = isJsonColumn(column); diff --git a/vuu-ui/packages/vuu-table/src/Table.tsx b/vuu-ui/packages/vuu-table/src/Table.tsx index 10c28cb4c..8bab3a610 100644 --- a/vuu-ui/packages/vuu-table/src/Table.tsx +++ b/vuu-ui/packages/vuu-table/src/Table.tsx @@ -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; diff --git a/vuu-ui/packages/vuu-table/src/VirtualColSpan.tsx b/vuu-ui/packages/vuu-table/src/VirtualColSpan.tsx deleted file mode 100644 index 5532a7caa..000000000 --- a/vuu-ui/packages/vuu-table/src/VirtualColSpan.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { memo } from "react"; - -export const VirtualColSpan = memo(function VirtualColSpan({ - width, -}: { - width: number; -}) { - return ( -
- ); -}); diff --git a/vuu-ui/packages/vuu-table/src/index.ts b/vuu-ui/packages/vuu-table/src/index.ts index 0c4d3c3ff..7f6f7cab7 100644 --- a/vuu-ui/packages/vuu-table/src/index.ts +++ b/vuu-ui/packages/vuu-table/src/index.ts @@ -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"; @@ -10,4 +9,4 @@ export * from "./useControlledTableNavigation"; export * from "./useTableModel"; export * from "./useTableScroll"; export * from "./useTableViewport"; -export * from "./VirtualColSpan"; +export * from "./bulk-edit"; diff --git a/vuu-ui/packages/vuu-table/src/table-header/TableHeader.tsx b/vuu-ui/packages/vuu-table/src/table-header/TableHeader.tsx index 4997c3b75..cf3cc8ca4 100644 --- a/vuu-ui/packages/vuu-table/src/table-header/TableHeader.tsx +++ b/vuu-ui/packages/vuu-table/src/table-header/TableHeader.tsx @@ -148,9 +148,9 @@ export const TableHeader = memo( /> ) )} + {customHeaders} {draggableColumn}
- {customHeaders}
); } diff --git a/vuu-ui/packages/vuu-theme/css/components/filters.css b/vuu-ui/packages/vuu-theme/css/components/filters.css index 0eacdbedb..798cd53e4 100644 --- a/vuu-ui/packages/vuu-theme/css/components/filters.css +++ b/vuu-ui/packages/vuu-theme/css/components/filters.css @@ -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); + } +} \ No newline at end of file diff --git a/vuu-ui/packages/vuu-ui-controls/package.json b/vuu-ui/packages/vuu-ui-controls/package.json index 8a8952d14..07f43256a 100644 --- a/vuu-ui/packages/vuu-ui-controls/package.json +++ b/vuu-ui/packages/vuu-ui-controls/package.json @@ -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" diff --git a/vuu-ui/sample-apps/app-vuu-example/package.json b/vuu-ui/sample-apps/app-vuu-example/package.json index 2da40a769..134bbd942 100644 --- a/vuu-ui/sample-apps/app-vuu-example/package.json +++ b/vuu-ui/sample-apps/app-vuu-example/package.json @@ -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", diff --git a/vuu-ui/sample-apps/feature-basket-trading/package.json b/vuu-ui/sample-apps/feature-basket-trading/package.json index 87518efa8..5c7f5f129 100644 --- a/vuu-ui/sample-apps/feature-basket-trading/package.json +++ b/vuu-ui/sample-apps/feature-basket-trading/package.json @@ -32,7 +32,7 @@ "@finos/vuu-table-extras": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "peerDependencies": { "clsx": "^2.0.0", diff --git a/vuu-ui/sample-apps/feature-filter-table/package.json b/vuu-ui/sample-apps/feature-filter-table/package.json index 0716becb0..7242dfc44 100644 --- a/vuu-ui/sample-apps/feature-filter-table/package.json +++ b/vuu-ui/sample-apps/feature-filter-table/package.json @@ -30,7 +30,7 @@ "@finos/vuu-table-extras": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "peerDependencies": { "clsx": "^2.0.0", diff --git a/vuu-ui/sample-apps/feature-instrument-tiles/package.json b/vuu-ui/sample-apps/feature-instrument-tiles/package.json index d2a592a6d..082f6b983 100644 --- a/vuu-ui/sample-apps/feature-instrument-tiles/package.json +++ b/vuu-ui/sample-apps/feature-instrument-tiles/package.json @@ -30,7 +30,7 @@ "@finos/vuu-table-extras": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "peerDependencies": { "clsx": "^2.0.0", diff --git a/vuu-ui/sample-apps/feature-template/package.json b/vuu-ui/sample-apps/feature-template/package.json index af91162e3..4cee7c4f6 100644 --- a/vuu-ui/sample-apps/feature-template/package.json +++ b/vuu-ui/sample-apps/feature-template/package.json @@ -29,7 +29,7 @@ "@finos/vuu-table-extras": "0.0.26", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@salt-ds/core": "1.27.1" + "@salt-ds/core": "1.22.0" }, "peerDependencies": { "clsx": "^2.0.0", diff --git a/vuu-ui/showcase/package.json b/vuu-ui/showcase/package.json index ab7418dec..67c822937 100644 --- a/vuu-ui/showcase/package.json +++ b/vuu-ui/showcase/package.json @@ -23,9 +23,8 @@ "@finos/vuu-showcase": "0.0.1", "@finos/vuu-theme": "0.0.26", "@finos/vuu-utils": "0.0.26", - "@floating-ui/react": "^0.26.5", "@internationalized/date": "^3.0.0", - "@salt-ds/core": "1.27.1", + "@salt-ds/core": "1.22.0", "@salt-ds/theme": "1.13.1", "clsx": "^2.0.0", "react": ">=17.0.2", diff --git a/vuu-ui/showcase/src/examples/DataTable/FilterTable.examples.tsx b/vuu-ui/showcase/src/examples/DataTable/FilterTable.examples.tsx index a442b7c93..aa1fa3a20 100644 --- a/vuu-ui/showcase/src/examples/DataTable/FilterTable.examples.tsx +++ b/vuu-ui/showcase/src/examples/DataTable/FilterTable.examples.tsx @@ -60,7 +60,11 @@ export const FilterTableVuuInstruments = () => { } return ( - + ); }; FilterTableVuuInstruments.displaySequence = displaySequence++; @@ -112,14 +116,18 @@ export const FilterTableArrayDataInstruments = () => { ...restTableProps, config, dataSource, + height: 645, renderBufferSize: 20, + width: 715, }; + console.log({ tableProps }); + return ( ); }; diff --git a/vuu-ui/showcase/src/examples/Filters/InlineFilter/InlineFilter.examples.tsx b/vuu-ui/showcase/src/examples/Filters/InlineFilter/InlineFilter.examples.tsx deleted file mode 100644 index 762c6a2e1..000000000 --- a/vuu-ui/showcase/src/examples/Filters/InlineFilter/InlineFilter.examples.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { useMemo } from "react"; -import { FilterValueChangeHandler, InlineFilter } from "@finos/vuu-filters"; -import { SimulTable } from "../../Table/SIMUL.examples"; - -let displaySequence = 0; - -export const SimpleInlineFilters = () => { - const inlineFilter = useMemo(() => { - const onChange: FilterValueChangeHandler = (column, value) => { - console.log(`apply filter to column ${column.name} using value ${value}`); - }; - return ; - }, []); - - return ( - - ); -}; -SimpleInlineFilters.displaySequence = displaySequence++; diff --git a/vuu-ui/showcase/src/examples/Filters/InlineFilter/index.ts b/vuu-ui/showcase/src/examples/Filters/InlineFilter/index.ts deleted file mode 100644 index 2c16d8370..000000000 --- a/vuu-ui/showcase/src/examples/Filters/InlineFilter/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./InlineFilter.examples"; diff --git a/vuu-ui/showcase/src/examples/Filters/index.ts b/vuu-ui/showcase/src/examples/Filters/index.ts index 0b1feaefc..9c900a1fd 100644 --- a/vuu-ui/showcase/src/examples/Filters/index.ts +++ b/vuu-ui/showcase/src/examples/Filters/index.ts @@ -1,5 +1,4 @@ export * as FilterBar from "./FilterBar"; export * as FilterClause from "./FilterClause"; export * as FilterEditor from "./FilterEditor"; -export * as InlineFilter from "./InlineFilter"; export * as QuickFilters from "./QuickFilters"; diff --git a/vuu-ui/showcase/src/examples/Popups/Dialog.examples.tsx b/vuu-ui/showcase/src/examples/Popups/Dialog.examples.tsx new file mode 100644 index 000000000..cdd8a3af3 --- /dev/null +++ b/vuu-ui/showcase/src/examples/Popups/Dialog.examples.tsx @@ -0,0 +1,41 @@ +import { useState } from "react"; + +import { Component } from "@finos/vuu-layout"; +import { Dialog } from "@finos/vuu-popups"; + +let displaySequence = 1; + +export const SimpleDialog = () => { + return ( + + + + ); +}; +SimpleDialog.displaySequence = displaySequence++; + +export const DialogOpenClose = () => { + const [open, setOpen] = useState(false); + const openDialog = () => { + setOpen(true); + }; + const closeDialog = () => { + console.log("close"); + setOpen(false); + }; + return ( +
+ + + + +
+ ); +}; +DialogOpenClose.displaySequence = displaySequence++; diff --git a/vuu-ui/showcase/src/examples/Popups/index.ts b/vuu-ui/showcase/src/examples/Popups/index.ts index d71332277..668aea507 100644 --- a/vuu-ui/showcase/src/examples/Popups/index.ts +++ b/vuu-ui/showcase/src/examples/Popups/index.ts @@ -1,4 +1,5 @@ export * as ContextMenu from "./ContextMenu.examples"; +export * as Dialog from "./Dialog.examples"; export * as PopupMenu from "./PopupMenu.examples"; export * as Tooltip from "./Tooltip.examples"; -export * as Notifications from "./Notifications"; +export * as Notifications from "./Notifications" diff --git a/vuu-ui/showcase/src/examples/Shell/SavePanel.examples.tsx b/vuu-ui/showcase/src/examples/Shell/SavePanel.examples.tsx index d55c20e3e..534efb22f 100644 --- a/vuu-ui/showcase/src/examples/Shell/SavePanel.examples.tsx +++ b/vuu-ui/showcase/src/examples/Shell/SavePanel.examples.tsx @@ -1,5 +1,5 @@ import { SaveLayoutPanel } from "@finos/vuu-shell"; -import { Dialog, DialogContent, DialogHeader } from "@salt-ds/core"; +import { Dialog } from "@finos/vuu-popups"; import { useCallback } from "react"; let displaySequence = 1; @@ -10,11 +10,13 @@ export const SavePanel = () => { }, []); return ( - - - - null} onSave={handleSave} /> - + + null} onSave={handleSave} /> ); }; diff --git a/vuu-ui/showcase/src/examples/Table/BulkEdit.examples.tsx b/vuu-ui/showcase/src/examples/Table/BulkEdit.examples.tsx index 0ec569abd..53a5e7fb0 100644 --- a/vuu-ui/showcase/src/examples/Table/BulkEdit.examples.tsx +++ b/vuu-ui/showcase/src/examples/Table/BulkEdit.examples.tsx @@ -1,15 +1,10 @@ import { useVuuMenuActions } from "@finos/vuu-data-react"; -import { - getSchema, - simulModule, - SimulTableName, - vuuModule, -} from "@finos/vuu-data-test"; +import { getSchema, simulModule, SimulTableName, vuuModule } from "@finos/vuu-data-test"; import { ContextMenuProvider, useDialog } from "@finos/vuu-popups"; import { BulkEditPanel, Table, TableProps } from "@finos/vuu-table"; import type { ColumnDescriptor, - DefaultColumnConfiguration, + DefaultColumnConfiguration } from "@finos/vuu-table-types"; import { applyDefaultColumnConfig } from "@finos/vuu-utils"; import { useCallback, useMemo } from "react"; @@ -26,13 +21,13 @@ const getDefaultColumnConfigSession = ( case "currency": return { editable: true, - type: { - name: "string", - renderer: { - name: "dropdown-cell", - values: ["CAD", "EUR", "GBP", "GBX", "USD"], - }, - }, + type: { + name: "string", + renderer: { + name: "dropdown-cell", + values: ["CAD", "EUR", "GBP", "GBX", "USD"], + }, + }, }; case "description": return { @@ -111,35 +106,46 @@ export const BulkEditTable = ({ }, []); const { dialog, setDialogState } = useDialog(); - + const handleCancel = () => { setDialogState(undefined); - }; - - const handleSubmit = useCallback(() => { - tableProps.dataSource.rpcCall?.({ - namedParams: {}, - params: ["1"], - rpcName: "APPLY_BULK_EDITS", - type: "VIEW_PORT_RPC_CALL", - }); - setDialogState(undefined); - }, [setDialogState, tableProps.dataSource]); + } - const handleEditMultiple = useCallback(() => { - tableProps.dataSource.rpcCall?.({ - namedParams: {}, - params: ["1"], - rpcName: "APPLY_EDIT_MULTIPLE", - type: "VIEW_PORT_RPC_CALL", - }); - setDialogState(undefined); - }, [setDialogState, tableProps.dataSource]); + const handleSubmit = useCallback( + () => { + tableProps.dataSource + .rpcCall?.({ + namedParams: {}, + params: ['1'], + rpcName: "APPLY_BULK_EDITS", + type: "VIEW_PORT_RPC_CALL", + }) + setDialogState(undefined); + }, + [tableProps] + ); - const rpcResponseHandler = (response: any) => { + const handleEditMultiple = useCallback( + () => { + tableProps.dataSource + .rpcCall?.({ + namedParams: {}, + params: ['1'], + rpcName: "APPLY_EDIT_MULTIPLE", + type: "VIEW_PORT_RPC_CALL", + }) + setDialogState(undefined); + }, + [] + ); + + const rpcResponseHandler = (response: any)=>{ const ds = simulModule.createDataSource(response.action.table.table); const tableConfig = { - columns: applyDefaultColumnConfig(schema, getDefaultColumnConfigSession), + columns: applyDefaultColumnConfig( + schema, + getDefaultColumnConfigSession, + ), rowSeparators: true, zebraStripes: true, }; @@ -162,23 +168,17 @@ export const BulkEditTable = ({ // width: 200, // valueFormatter: getValueFormatter(buildColDescriptor(schemas.instruments), 'string'), // } - if (response.rpcName === "BULK_EDIT") { + if (response.rpcName === "BULK_EDIT"){ const content = { - content: ( - - ), - title: "Edit Instruments", - }; + content: + + , + title: 'Edit Instruments', + } setDialogState(content); } return true; - }; + } const { buildViewserverMenuOptions, handleMenuAction } = useVuuMenuActions({ dataSource: tableProps.dataSource, @@ -187,22 +187,22 @@ export const BulkEditTable = ({ return ( <> - - - - - - {dialog} + + +
+ + + {dialog} ); }; -BulkEditTable.displaySequence = displaySequence++; +BulkEditTable.displaySequence = displaySequence++; \ No newline at end of file diff --git a/vuu-ui/showcase/src/examples/Table/SIMUL.examples.tsx b/vuu-ui/showcase/src/examples/Table/SIMUL.examples.tsx index a452ec055..77d0b521b 100644 --- a/vuu-ui/showcase/src/examples/Table/SIMUL.examples.tsx +++ b/vuu-ui/showcase/src/examples/Table/SIMUL.examples.tsx @@ -1,16 +1,22 @@ import { useVuuMenuActions } from "@finos/vuu-data-react"; -import { getSchema, SimulTableName, vuuModule } from "@finos/vuu-data-test"; -import { ContextMenuProvider } from "@finos/vuu-popups"; +import { + getSchema, + simulModule, + SimulTableName, + vuuModule, +} from "@finos/vuu-data-test"; +import { ContextMenuProvider, Dialog } from "@finos/vuu-popups"; import { Table, TableProps } from "@finos/vuu-table"; import type { ColumnDescriptor, DefaultColumnConfiguration, } from "@finos/vuu-table-types"; import { applyDefaultColumnConfig } from "@finos/vuu-utils"; -import { useCallback, useMemo } from "react"; +import { useCallback, useMemo, useState, ReactElement } from "react"; import { DemoTableContainer } from "./DemoTableContainer"; import "./BuySellRowClassNameGenerator"; +import { Button } from "@salt-ds/core"; //import { BulkEditRow } from "@finos/vuu-table"; let displaySequence = 1; @@ -59,6 +65,72 @@ const getDefaultColumnConfig = ( } }; +const getDefaultColumnConfigSession = ( + tableName: string, + columnName: string +): Partial | undefined => { + switch (columnName) { + case "currency": + return { + editable: true, + type: { + name: "string", + renderer: { + name: "dropdown-cell", + values: ["CAD", "EUR", "GBP", "GBX", "USD"], + }, + }, + }; + case "description": + return { + editable: true, + type: { + name: "string", + renderer: { + name: "input-cell", + }, + }, + }; + case "exchange": + return { + editable: true, + type: { + name: "string", + renderer: { + name: "input-cell", + }, + }, + }; + + case "isin": + return { + editable: true, + type: { + name: "string", + renderer: { + name: "input-cell", + }, + }, + }; + case "lotSize": + return { + editable: true, + type: { + name: "number", + renderer: { + name: "input-cell", + }, + }, + }; + } +}; + +export type DialogState = { + content: ReactElement; + title: string; + hideCloseButton?: boolean; +}; + export const SimulTable = ({ getDefaultColumnConfig, height = 625, @@ -91,8 +163,78 @@ export const SimulTable = ({ // console.log(JSON.stringify(config, null, 2)); }, []); + const [dialogState, setDialogState] = useState(); + + const closeDialog = () => { + setDialogState(undefined); + }; + + const handleSubmit = useCallback(() => { + tableProps.dataSource.rpcCall?.({ + namedParams: {}, + params: ["1"], + rpcName: "APPLY_BULK_EDITS", + type: "VIEW_PORT_RPC_CALL", + }); + setDialogState(undefined); + }, []); + + const handleEditMultiple = useCallback(() => { + tableProps.dataSource.rpcCall?.({ + namedParams: {}, + params: ["1"], + rpcName: "APPLY_EDIT_MULTIPLE", + type: "VIEW_PORT_RPC_CALL", + }); + setDialogState(undefined); + }, []); + + const rpcResponseHandler = (response: any) => { + //console.log(response); + const ds = simulModule.createDataSource(response.action.table.table); + const tableConfig = { + columns: applyDefaultColumnConfig(schema, getDefaultColumnConfigSession), + rowSeparators: true, + zebraStripes: true, + }; + + if (response.rpcName === "EDIT_ROW") { + const content = { + content: ( + <> +
+ + + + + ), + title: "Edit", + }; + setDialogState(content); + } + return true; + }; + + const dialog = dialogState ? ( + + {dialogState.content} + + ) : null; + const { buildViewserverMenuOptions, handleMenuAction } = useVuuMenuActions({ dataSource: tableProps.dataSource, + onRpcResponse: rpcResponseHandler, }); return ( @@ -111,6 +253,7 @@ export const SimulTable = ({ /> + {dialog} ); }; diff --git a/vuu-ui/showcase/src/examples/salt/Dialog.examples.css b/vuu-ui/showcase/src/examples/salt/Dialog.examples.css deleted file mode 100644 index 673f0339b..000000000 --- a/vuu-ui/showcase/src/examples/salt/Dialog.examples.css +++ /dev/null @@ -1,11 +0,0 @@ -.fakeDialogWindow { - padding-top: var(--salt-spacing-300); - padding-bottom: var(--salt-spacing-300); - background: var(--salt-container-primary-background); - box-shadow: var(--salt-overlayable-shadow-modal); - z-index: var(--salt-zIndex-drawer); - height: min-content; - border-width: var(--salt-size-border); - border-style: var(--salt-container-borderStyle); - border-color: var(--salt-separable-tertiary-borderColor); -} diff --git a/vuu-ui/showcase/src/examples/salt/Dialog.examples.tsx b/vuu-ui/showcase/src/examples/salt/Dialog.examples.tsx deleted file mode 100644 index cb7bc7343..000000000 --- a/vuu-ui/showcase/src/examples/salt/Dialog.examples.tsx +++ /dev/null @@ -1,328 +0,0 @@ -import { - FC, - PropsWithChildren, - ReactElement, - ReactNode, - useEffect, - useMemo, - useState, -} from "react"; -import { - Button, - StackLayout, - Dialog, - DialogHeader, - DialogActions, - DialogContent, - DialogCloseButton, - DialogProps, -} from "@salt-ds/core"; - -import "./Dialog.examples.css"; - -let displaySequence = 1; - -const UnmountLogger = () => { - useEffect(() => { - return () => { - console.log(new Date().getTime(), "Dummy unmount"); - }; - }, []); - return null; -}; - -const DialogTemplate: FC< - Omit & { - header?: string; - preheader?: string; - content?: JSX.Element; - } -> = ({ - header, - preheader, - content, - id, - size, - open: openProp = false, - ...args -}) => { - const [open, setOpen] = useState(openProp); - - const handleRequestOpen = () => { - setOpen(true); - }; - - const onOpenChange = (value: boolean) => { - setOpen(value); - }; - - const handleClose = () => { - setOpen(false); - }; - - return ( - <> - - - - - {content} - - - - - - - - - - - ); -}; - -export const DefaultDialog = () => ; -DefaultDialog.displaySequence = displaySequence++; - -export const LongContent = () => { - const content = useMemo( - () => ( - -
- Lorem Ipsum is simply dummy text of the printing and typesetting - industry. Lorem Ipsum has been the industry's standard dummy text ever - since the 1500s, when an unknown printer took a galley of type and - scrambled it to make a type specimen book. -
-
- It has survived not only five centuries, but also the leap into - electronic typesetting, remaining essentially unchanged. It was - popularised in the 1960s with the release of Letraset sheets - containing Lorem Ipsum passages, and more recently with desktop - publishing software like Aldus PageMaker including versions of Lorem - Ipsum. -
-
- It is a long established fact that a reader will be distracted by the - readable content of a page when looking at its layout. The point of - using Lorem Ipsum is that it has a more-or-less normal distribution of - letters, as opposed to using 'Content here, content here', making it - look like readable English. -
-
- Many desktop publishing packages and web page editors now use Lorem - Ipsum as their default model text, and a search for 'lorem ipsum' will - uncover many web sites still in their infancy. Various versions have - evolved over the years, sometimes by accident, sometimes on purpose - (injected humour and the like). -
-
- Contrary to popular belief, Lorem Ipsum is not simply random text. It - has roots in a piece of classical Latin literature from 45 BC, making - it over 2000 years old. Richard McClintock, a Latin professor at - Hampden-Sydney College in Virginia, looked up one of the more obscure - Latin words, consectetur, from a Lorem Ipsum passage, and going - through the cites of the word in classical literature, discovered the - undoubtable source. -
-
- Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus - Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written - in 45 BC. This book is a treatise on the theory of ethics, very - popular during the Renaissance. The first line of Lorem Ipsum, "Lorem - ipsum dolor sit amet..", comes from a line in section 1.10.32. -
-
- ), - [] - ); - - return ( - - ); -}; -LongContent.displaySequence = displaySequence++; - -export const Preheader = () => ( - -); -Preheader.displaySequence = displaySequence++; - -const AlertDialogTemplate: FC< - Omit & { header: string; content?: ReactNode } -> = ({ - open: openProp = false, - status, - header, - size = "small", - content, - ...args -}) => { - const [open, setOpen] = useState(openProp); - - const handleRequestOpen = () => { - setOpen(true); - }; - - const onOpenChange = (value: boolean) => { - setOpen(value); - }; - - const handleClose = () => { - setOpen(false); - }; - - return ( - <> - - - - {content} - - - - - - - ); -}; - -export const InfoStatus = () => ( - -); -InfoStatus.displaySequence = displaySequence++; - -export const SuccessStatus = () => ( - -); -SuccessStatus.displaySequence = displaySequence++; - -export const Warningtatus = () => ( - -); -Warningtatus.displaySequence = displaySequence++; - -export const ErrorStatus = () => ( - -); -ErrorStatus.displaySequence = displaySequence++; - -export const MandatoryAction = ({ open: openProp = false }: DialogProps) => { - const [open, setOpen] = useState(openProp); - - const handleRequestOpen = () => { - setOpen(true); - }; - - const onOpenChange = (value: boolean) => { - setOpen(value); - }; - - const handleClose = () => { - setOpen(false); - }; - - return ( - <> - - - - - - Are you sure you want to permanently delete this transaction - - - - - - - - ); -}; -MandatoryAction.displaySequence = displaySequence++; - -function FakeWindow({ children }: PropsWithChildren) { - return ( -
-
- {children} -
- ); -} - -export const DesktopDialog = () => { - return ( - - - - Hello world! - - - - - - - - - Accent world! - - - - - - - - - Potential issues abound! - - - - - - - ); -}; -DesktopDialog.displaySequence = displaySequence++; diff --git a/vuu-ui/showcase/src/examples/salt/Menu.examples.tsx b/vuu-ui/showcase/src/examples/salt/Menu.examples.tsx deleted file mode 100644 index 4bdd73e47..000000000 --- a/vuu-ui/showcase/src/examples/salt/Menu.examples.tsx +++ /dev/null @@ -1,342 +0,0 @@ -import { - Button, - Card, - Menu, - MenuGroup, - MenuItem, - MenuPanel, - MenuProps, - MenuTrigger, -} from "@salt-ds/core"; -import { - CopyIcon, - ExportIcon, - MicroMenuIcon, - PasteIcon, - SettingsIcon, -} from "@salt-ds/icons"; -import { useState } from "react"; -import { VirtualElement } from "@floating-ui/react"; - -let displaySequence = 1; - -export const SingleLevel = (args: MenuProps) => { - return ( - - - - - - { - alert("Copy"); - }} - > - Copy - - { - alert("Paste"); - }} - > - Paste - - { - alert("Export"); - }} - > - Export - - { - alert("Settings"); - }} - > - Settings - - - - ); -}; -SingleLevel.displaySequence = displaySequence++; - -function EditStylingMenu() { - return ( - - - Edit styling - - - { - alert("Column"); - }} - > - Column - - { - alert("Cell"); - }} - > - Cell - - { - alert("Row"); - }} - > - Row - - - - ); -} -EditStylingMenu.displaySequence = displaySequence++; - -function ClearStylingMenu() { - return ( - - - Clear styling - - - { - alert("Column"); - }} - > - Column - - { - alert("Cell"); - }} - > - Cell - - { - alert("Row"); - }} - > - Row - - - - ); -} -ClearStylingMenu.displaySequence = displaySequence++; - -export const MultiLevel = (args: MenuProps) => { - return ( - - - - - - { - alert("Copy"); - }} - > - Copy - - - - { - alert("Export"); - }} - > - Export - - { - alert("Settings"); - }} - > - Settings - - - - ); -}; -MultiLevel.displaySequence = displaySequence++; - -export const GroupedItems = (args: MenuProps) => { - return ( - - - - - - - Copy - Paste - - - - - - - Export - Settings - - - - ); -}; -GroupedItems.displaySequence = displaySequence++; - -export const SeparatorOnly = (args: MenuProps) => { - return ( - - - - - - - Copy - Paste - - - - - - - Export - Settings - - - - ); -}; -SeparatorOnly.displaySequence = displaySequence++; - -export const Icons = (args: MenuProps) => { - return ( - - - - - - - - Copy - - - - Export - - - - Settings - - - - ); -}; -Icons.displaySequence = displaySequence++; - -export const IconWithGroups = (args: MenuProps) => { - return ( - - - - - - - - - Copy - - - - Paste - - - - - - - - - - Export - - - - Settings - - - - - ); -}; -IconWithGroups.displaySequence = displaySequence++; - -export const ContextMenu = () => { - const [virtualElement, setVirtualElement] = useState( - null - ); - const [open, setOpen] = useState(false); - return ( - <> - { - event.preventDefault(); - //React 16 support - event.persist(); - setVirtualElement({ - getBoundingClientRect: () => ({ - width: 0, - height: 0, - x: event.clientX, - y: event.clientY, - top: event.clientY, - right: event.clientX, - bottom: event.clientY, - left: event.clientX, - }), - }); - setOpen(true); - }} - > - Right click here - - virtualElement} - open={open} - onOpenChange={setOpen} - > - - Copy - Move - Delete - - - - ); -}; -ContextMenu.displaySequence = displaySequence++; diff --git a/vuu-ui/showcase/src/examples/salt/index.ts b/vuu-ui/showcase/src/examples/salt/index.ts index 7946bc6c4..06e06f2a7 100644 --- a/vuu-ui/showcase/src/examples/salt/index.ts +++ b/vuu-ui/showcase/src/examples/salt/index.ts @@ -2,11 +2,9 @@ export * as Accordion from "./Accordion.examples"; export * as Button from "./Button.examples"; export * as Checkbox from "./Checkbox.examples"; export * as ComboBox from "./ComboBox.examples"; -export * as Dialog from "./Dialog.examples"; export * as Dropdown from "./Dropdown.examples"; export * as Input from "./Input.examples"; export * as FormField from "./FormField.examples"; -export * as Menu from "./Menu.examples"; export * as Progress from "./Progress.examples"; export * as Switch from "./Switch.examples"; export * as ToggleButton from "./ToggleButton.examples"; diff --git a/vuu-ui/tools/vuu-showcase/package.json b/vuu-ui/tools/vuu-showcase/package.json index c394449c5..2a3c73df9 100644 --- a/vuu-ui/tools/vuu-showcase/package.json +++ b/vuu-ui/tools/vuu-showcase/package.json @@ -15,7 +15,7 @@ "@finos/vuu-theme": "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/theme": "1.13.1" }, "peerDependencies": { diff --git a/vuu-ui/tools/vuu-showcase/src/Showcase.css b/vuu-ui/tools/vuu-showcase/src/Showcase.css index 8f2e6cf92..c0737a751 100644 --- a/vuu-ui/tools/vuu-showcase/src/Showcase.css +++ b/vuu-ui/tools/vuu-showcase/src/Showcase.css @@ -17,7 +17,7 @@ body { height: var(--vuuToolbarProxy-height, 36px); } -.vuuToolbarProxy > [data-align="end"] { +.vuuToolbarProxy > [data-align="end"]{ margin-left: auto; } @@ -31,15 +31,16 @@ body { .vuuShowcase-StandaloneRoot { height: 100vh; /** this prevents root being displaced by component margin */ - position: absolute; - left: 0; - top: 0; + position:absolute; + left:0; + top:0; width: 100vw; background-color: var(--salt-container-primary-background); } -.vuuShowcase-StandaloneRoot:has(> [data-showcase-center]) { +.vuuShowcase-StandaloneRoot:has([data-showcase-center]){ align-items: center; display: flex; justify-content: center; -} + +} \ No newline at end of file