From 07f64bfdd253eaa8c36613da3a22394ed1afae84 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Mon, 19 Sep 2022 16:18:44 -0700 Subject: [PATCH 01/10] Custom resize cursors --- .../table/cursors/Cur_MoveHorizontal_9_9.svg | 14 ++++++++++++++ .../table/cursors/Cur_MoveToLeft_9_9.svg | 5 +++++ .../table/cursors/Cur_MoveToRight_9_9.svg | 5 +++++ .../components/table/index.css | 15 ++++++++++++--- .../@react-spectrum/table/src/Resizer.tsx | 19 +++++++++++-------- 5 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveHorizontal_9_9.svg create mode 100644 packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToLeft_9_9.svg create mode 100644 packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToRight_9_9.svg diff --git a/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveHorizontal_9_9.svg b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveHorizontal_9_9.svg new file mode 100644 index 00000000000..b7beacd3aa8 --- /dev/null +++ b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveHorizontal_9_9.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToLeft_9_9.svg b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToLeft_9_9.svg new file mode 100644 index 00000000000..2269dc0ed73 --- /dev/null +++ b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToLeft_9_9.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToRight_9_9.svg b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToRight_9_9.svg new file mode 100644 index 00000000000..c606236adaf --- /dev/null +++ b/packages/@adobe/spectrum-css-temp/components/table/cursors/Cur_MoveToRight_9_9.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/@adobe/spectrum-css-temp/components/table/index.css b/packages/@adobe/spectrum-css-temp/components/table/index.css index 66d28948fd7..34a31067fe7 100644 --- a/packages/@adobe/spectrum-css-temp/components/table/index.css +++ b/packages/@adobe/spectrum-css-temp/components/table/index.css @@ -455,11 +455,20 @@ svg.spectrum-Table-sortedIcon { } .resize-ew * { - cursor: col-resize !important; + cursor: url('./cursors/Cur_MoveHorizontal_9_9.svg'), ew-resize !important; } .resize-e * { - cursor: e-resize !important; + cursor: url('./cursors/Cur_MoveToRight_9_9.svg'), e-resize !important; } .resize-w * { - cursor: w-resize !important; + cursor: url('./cursors/Cur_MoveToLeft_9_9.svg'), w-resize !important; +} +.spectrum-Table-columnResizer--ewresize { + cursor: url('./cursors/Cur_MoveHorizontal_9_9.svg'), ew-resize; +} +.spectrum-Table-columnResizer--eresize { + cursor: url('./cursors/Cur_MoveToRight_9_9.svg'), e-resize; +} +.spectrum-Table-columnResizer--wresize { + cursor: url('./cursors/Cur_MoveToLeft_9_9.svg'), w-resize; } diff --git a/packages/@react-spectrum/table/src/Resizer.tsx b/packages/@react-spectrum/table/src/Resizer.tsx index 46e69d429ad..f3c08e6794c 100644 --- a/packages/@react-spectrum/table/src/Resizer.tsx +++ b/packages/@react-spectrum/table/src/Resizer.tsx @@ -58,13 +58,8 @@ function Resizer(props: ResizerProps, ref: RefObject) { display: showResizer ? undefined : 'none', touchAction: 'none' }; - if (columnState.getColumnMinWidth(column.key) >= columnState.getColumnWidth(column.key)) { - style.cursor = direction === 'rtl' ? 'w-resize' : 'e-resize'; - } else if (columnState.getColumnMaxWidth(column.key) <= columnState.getColumnWidth(column.key)) { - style.cursor = direction === 'rtl' ? 'e-resize' : 'w-resize'; - } else { - style.cursor = 'col-resize'; - } + let isEResizable = columnState.getColumnMinWidth(column.key) >= columnState.getColumnWidth(column.key); + let isWResizable = columnState.getColumnMaxWidth(column.key) <= columnState.getColumnWidth(column.key); return ( <> @@ -72,7 +67,15 @@ function Resizer(props: ResizerProps, ref: RefObject) {
Date: Tue, 20 Sep 2022 11:01:48 -0700 Subject: [PATCH 02/10] Add menu chevron on hover/focus --- .../components/table/index.css | 21 ++++++++++++++++++- .../@react-spectrum/table/src/TableView.tsx | 21 ++++++++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/packages/@adobe/spectrum-css-temp/components/table/index.css b/packages/@adobe/spectrum-css-temp/components/table/index.css index 34a31067fe7..20ca42e99b3 100644 --- a/packages/@adobe/spectrum-css-temp/components/table/index.css +++ b/packages/@adobe/spectrum-css-temp/components/table/index.css @@ -32,7 +32,7 @@ governing permissions and limitations under the License. svg.spectrum-Table-sortedIcon { display: none; flex: 0 0 auto; - margin-inline-start: var(--spectrum-table-header-sort-icon-gap); + margin-inline-end: var(--spectrum-table-header-sort-icon-gap); min-inline-size: var(--spectrum-icon-arrow-down-small-width); vertical-align: middle; @@ -40,6 +40,15 @@ svg.spectrum-Table-sortedIcon { transition: transform var(--spectrum-global-animation-duration-100) ease-in-out; } +.spectrum-Table-menuChevron { + display: none; + flex: 0 0 auto; + margin-inline-start: var(--spectrum-table-header-sort-icon-gap); + min-inline-size: var(--spectrum-icon-chevron-down-medium-width); + + vertical-align: middle; +} + .spectrum-Table-headWrapper { border-left-width: 1px; border-left-style: solid; @@ -106,6 +115,12 @@ svg.spectrum-Table-sortedIcon { text-overflow: ellipsis; } } + &.is-hovered, + &.is-cell-focused { + .spectrum-Table-menuChevron { + display: inline-block; + } + } } .spectrum-Table-columnResizer { @@ -285,6 +300,10 @@ svg.spectrum-Table-sortedIcon { } } } +.spectrum-Table-headCellButton { + display: flex; + align-items: center; +} .spectrum-Table-headCell, .spectrum-Table-headCellButton { diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx index fb1a215d53f..4b5687abe65 100644 --- a/packages/@react-spectrum/table/src/TableView.tsx +++ b/packages/@react-spectrum/table/src/TableView.tsx @@ -13,10 +13,11 @@ import ArrowDownSmall from '@spectrum-icons/ui/ArrowDownSmall'; import {chain, mergeProps, useLayoutEffect} from '@react-aria/utils'; import {Checkbox} from '@react-spectrum/checkbox'; +import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium'; import {classNames, useDOMRef, useFocusableRef, useStyleProps, useUnwrapDOMRef} from '@react-spectrum/utils'; import {DOMRef, FocusableRef, MoveMoveEvent} from '@react-types/shared'; import {FocusRing, FocusScope, useFocusRing} from '@react-aria/focus'; -import {getInteractionModality, useHover, usePress} from '@react-aria/interactions'; +import {getInteractionModality, useFocus, useFocusWithin, useHover, usePress} from '@react-aria/interactions'; import {GridNode} from '@react-types/grid'; // @ts-ignore import intlMessages from '../intl/*.json'; @@ -568,13 +569,13 @@ function TableColumnHeader(props) { ) ) }> + {columnProps.allowsSorting && + + } {columnProps.hideHeader ? {column.rendered} :
{column.rendered}
} - {columnProps.allowsSorting && - - }
); @@ -608,8 +609,10 @@ function ResizableTableColumnHeader(props) { hasMenu: true }, state, ref); let {hoverProps, isHovered} = useHover({...props, isDisabled: isEmpty}); + let [isFocused, setIsFocused] = useState(false); + let {focusWithinProps} = useFocusWithin({onFocusWithinChange: setIsFocused, isDisabled: isEmpty}); - const allProps = [columnHeaderProps, hoverProps, pressProps]; + const allProps = [columnHeaderProps, hoverProps, pressProps, focusWithinProps]; let columnProps = column.props as SpectrumColumnProps; @@ -679,6 +682,7 @@ function ResizableTableColumnHeader(props) { 'is-sorted-desc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'descending', 'is-sorted-asc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'ascending', 'is-hovered': isHovered, + 'is-cell-focused': isFocused, 'spectrum-Table-cell--hideHeader': columnProps.hideHeader }, classNames( @@ -693,12 +697,15 @@ function ResizableTableColumnHeader(props) { }> + {columnProps.allowsSorting && + + } {columnProps.hideHeader ? {column.rendered} : column.rendered } - {columnProps.allowsSorting && - + { + columnProps.allowsSorting && } From fec7964b0556a63e26ca01b0065c868b181f3109 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Tue, 20 Sep 2022 15:20:22 -0700 Subject: [PATCH 03/10] auto inline svgs --- .chromatic/webpack-chromatic.config.js | 3 +++ .storybook/css-url-rename-plugin/loader.js | 10 ++++++++++ .storybook/webpack-storybook.config.js | 3 +++ .../components/table/index.css | 18 ++++++------------ .../@react-spectrum/table/src/TableView.tsx | 2 +- 5 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 .storybook/css-url-rename-plugin/loader.js diff --git a/.chromatic/webpack-chromatic.config.js b/.chromatic/webpack-chromatic.config.js index ee618abd0b9..77934f78863 100644 --- a/.chromatic/webpack-chromatic.config.js +++ b/.chromatic/webpack-chromatic.config.js @@ -63,6 +63,9 @@ module.exports = () => { ident: 'postcss', plugins: require('../postcss.config').plugins } + }, + { + loader: path.resolve(__dirname, '../.storybook/css-url-rename-plugin/loader.js') } ], include: path.resolve(__dirname, '../') diff --git a/.storybook/css-url-rename-plugin/loader.js b/.storybook/css-url-rename-plugin/loader.js new file mode 100644 index 00000000000..2c760fa7bdd --- /dev/null +++ b/.storybook/css-url-rename-plugin/loader.js @@ -0,0 +1,10 @@ + +function loader(source) { + // Apply some transformations to the source... + if (source.indexOf(/data-url:/ig) > -1) { + source = source.replace(/data-url:/ig, ''); + } + return source; +} + +exports.default = loader; diff --git a/.storybook/webpack-storybook.config.js b/.storybook/webpack-storybook.config.js index 58435bea8b9..0b0e6468a16 100644 --- a/.storybook/webpack-storybook.config.js +++ b/.storybook/webpack-storybook.config.js @@ -60,6 +60,9 @@ module.exports = () => { ident: 'postcss', plugins: require('../postcss.config').plugins } + }, + { + loader: path.resolve(__dirname, './css-url-rename-plugin/loader.js') } ], include: path.resolve(__dirname, '../') diff --git a/packages/@adobe/spectrum-css-temp/components/table/index.css b/packages/@adobe/spectrum-css-temp/components/table/index.css index 20ca42e99b3..a98cc497ba5 100644 --- a/packages/@adobe/spectrum-css-temp/components/table/index.css +++ b/packages/@adobe/spectrum-css-temp/components/table/index.css @@ -473,21 +473,15 @@ svg.spectrum-Table-sortedIcon { } } -.resize-ew * { - cursor: url('./cursors/Cur_MoveHorizontal_9_9.svg'), ew-resize !important; -} -.resize-e * { - cursor: url('./cursors/Cur_MoveToRight_9_9.svg'), e-resize !important; -} -.resize-w * { - cursor: url('./cursors/Cur_MoveToLeft_9_9.svg'), w-resize !important; -} +.resize-ew *, .spectrum-Table-columnResizer--ewresize { - cursor: url('./cursors/Cur_MoveHorizontal_9_9.svg'), ew-resize; + cursor: url('data-url:./cursors/Cur_MoveHorizontal_9_9.svg'), ew-resize !important; } +.resize-e *, .spectrum-Table-columnResizer--eresize { - cursor: url('./cursors/Cur_MoveToRight_9_9.svg'), e-resize; + cursor: url('data-url:./cursors/Cur_MoveToRight_9_9.svg'), e-resize !important; } +.resize-w *, .spectrum-Table-columnResizer--wresize { - cursor: url('./cursors/Cur_MoveToLeft_9_9.svg'), w-resize; + cursor: url('data-url:./cursors/Cur_MoveToLeft_9_9.svg'), w-resize !important; } diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx index 4b5687abe65..e241c473b4a 100644 --- a/packages/@react-spectrum/table/src/TableView.tsx +++ b/packages/@react-spectrum/table/src/TableView.tsx @@ -17,7 +17,7 @@ import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium'; import {classNames, useDOMRef, useFocusableRef, useStyleProps, useUnwrapDOMRef} from '@react-spectrum/utils'; import {DOMRef, FocusableRef, MoveMoveEvent} from '@react-types/shared'; import {FocusRing, FocusScope, useFocusRing} from '@react-aria/focus'; -import {getInteractionModality, useFocus, useFocusWithin, useHover, usePress} from '@react-aria/interactions'; +import {getInteractionModality, useFocusWithin, useHover, usePress} from '@react-aria/interactions'; import {GridNode} from '@react-types/grid'; // @ts-ignore import intlMessages from '../intl/*.json'; From 099ec6993a0172bd38c8ecd8ed736fc3e6ba4096 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Tue, 20 Sep 2022 16:07:53 -0700 Subject: [PATCH 04/10] fix parcel --- package.json | 4 + packages/dev/parcel-namer-docs/DocsNamer.js | 3 + yarn.lock | 290 +++++++++++++++++++- 3 files changed, 295 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4647dc91a11..ac318685a55 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,11 @@ "@octokit/rest": "*", "@parcel/bundler-experimental": "^2.2.1", "@parcel/optimizer-css": "^2.2.1", + "@parcel/optimizer-data-url": "^2.2.1", "@parcel/packager-ts": "^2.2.1", "@parcel/resolver-glob": "^2.2.1", "@parcel/transformer-inline": "^2.2.1", + "@parcel/transformer-inline-string": "^2.2.1", "@parcel/transformer-svg-react": "^2.2.1", "@parcel/transformer-typescript-types": "^2.2.1", "@spectrum-css/component-builder": "^1.0.0", @@ -181,6 +183,8 @@ "resolutions": { "@babel/core": "7.12.10", "@babel/runtime": "7.12.5", + "@parcel/optimizer-data-url": "2.2.1", + "@parcel/transformer-inline-string": "2.2.1", "postcss-calc": "6.0.2", "jsdom": "16.7.0", "postcss-modules": "^3.2.2" diff --git a/packages/dev/parcel-namer-docs/DocsNamer.js b/packages/dev/parcel-namer-docs/DocsNamer.js index db9be561fae..116ac2d93fe 100644 --- a/packages/dev/parcel-namer-docs/DocsNamer.js +++ b/packages/dev/parcel-namer-docs/DocsNamer.js @@ -50,6 +50,9 @@ module.exports = new Namer({ let bundleGroup = bundleGraph.getBundleGroupsContainingBundle(bundle)[0]; let bundleGroupBundles = bundleGraph.getBundlesInBundleGroup(bundleGroup); let mainBundle = bundleGroupBundles.find(b => b.getEntryAssets().some(a => a.id === bundleGroup.entryAssetId)); + if (!mainBundle) { + return null; + } let entry = mainBundle.getEntryAssets().find(a => a.id === bundleGroup.entryAssetId).filePath; return path.basename(entry, path.extname(entry)) + '.' + bundle.hashReference + '.' + bundle.type; } else { diff --git a/yarn.lock b/yarn.lock index b77005e7532..9b10f961227 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2324,6 +2324,48 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" +"@lezer/common@^0.15.0", "@lezer/common@^0.15.7": + version "0.15.12" + resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.15.12.tgz#2f21aec551dd5fd7d24eb069f90f54d5bc6ee5e9" + integrity sha512-edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig== + +"@lezer/lr@^0.15.4": + version "0.15.8" + resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.15.8.tgz#1564a911e62b0a0f75ca63794a6aa8c5dc63db21" + integrity sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg== + dependencies: + "@lezer/common" "^0.15.0" + +"@lmdb/lmdb-darwin-arm64@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.5.2.tgz#bc66fa43286b5c082e8fee0eacc17995806b6fbe" + integrity sha512-+F8ioQIUN68B4UFiIBYu0QQvgb9FmlKw2ctQMSBfW2QBrZIxz9vD9jCGqTCPqZBRbPHAS/vG1zSXnKqnS2ch/A== + +"@lmdb/lmdb-darwin-x64@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.5.2.tgz#89d8390041bce6bab24a82a20392be22faf54ffc" + integrity sha512-KvPH56KRLLx4KSfKBx0m1r7GGGUMXm0jrKmNE7plbHlesZMuPJICtn07HYgQhj1LNsK7Yqwuvnqh1QxhJnF1EA== + +"@lmdb/lmdb-linux-arm64@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.5.2.tgz#14fe4c96c2bb1285f93797f45915fa35ee047268" + integrity sha512-aLl89VHL/wjhievEOlPocoefUyWdvzVrcQ/MHQYZm2JfV1jUsrbr/ZfkPPUFvZBf+VSE+Q0clWs9l29PCX1hTQ== + +"@lmdb/lmdb-linux-arm@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.5.2.tgz#05bde4573ab10cf21827339fe687148f2590cfa1" + integrity sha512-5kQAP21hAkfW5Bl+e0P57dV4dGYnkNIpR7f/GAh6QHlgXx+vp/teVj4PGRZaKAvt0GX6++N6hF8NnGElLDuIDw== + +"@lmdb/lmdb-linux-x64@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.5.2.tgz#d2f85afd857d2c33d2caa5b057944574edafcfee" + integrity sha512-xUdUfwDJLGjOUPH3BuPBt0NlIrR7f/QHKgu3GZIXswMMIihAekj2i97oI0iWG5Bok/b+OBjHPfa8IU9velnP/Q== + +"@lmdb/lmdb-win32-x64@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.5.2.tgz#28f643fbc0bec30b07fbe95b137879b6b4d1c9c5" + integrity sha512-zrBczSbXKxEyK2ijtbRdICDygRqWSRPpZMN5dD1T8VMEW5RIhIbwFWw2phDRXuBQdVDpSjalCIUMWMV2h3JaZA== + "@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" @@ -2385,6 +2427,15 @@ resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== +"@mischnic/json-sourcemap@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz#38af657be4108140a548638267d02a2ea3336507" + integrity sha512-dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA== + dependencies: + "@lezer/common" "^0.15.7" + "@lezer/lr" "^0.15.4" + json5 "^2.2.1" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -2393,6 +2444,36 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" +"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz#9571b87be3a3f2c46de05585470bc4f3af2f6f00" + integrity sha512-TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ== + +"@msgpackr-extract/msgpackr-extract-darwin-x64@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz#bfbc6936ede2955218f5621a675679a5fe8e6f4c" + integrity sha512-YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few== + +"@msgpackr-extract/msgpackr-extract-linux-arm64@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz#22555e28382af2922e7450634c8a2f240bb9eb82" + integrity sha512-vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg== + +"@msgpackr-extract/msgpackr-extract-linux-arm@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz#ffb6ae1beea7ac572b6be6bf2a8e8162ebdd8be7" + integrity sha512-42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA== + +"@msgpackr-extract/msgpackr-extract-linux-x64@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz#7caf62eebbfb1345de40f75e89666b3d4194755f" + integrity sha512-RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg== + +"@msgpackr-extract/msgpackr-extract-win32-x64@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz#f2d8b9ddd8d191205ed26ce54aba3dfc5ae3e7c9" + integrity sha512-rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw== + "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents": version "2.1.8-no-fsevents" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz#da7c3996b8e6e19ebd14d82eaced2313e7769f9b" @@ -2613,6 +2694,16 @@ "@parcel/utils" "^2.2.1" nullthrows "^1.1.1" +"@parcel/cache@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.7.0.tgz#cc4b99685c7ff0fc20fbc321f4b6850d6e0c6811" + integrity sha512-JlXNoZXcWzLKdDlfeF3dIj5Vtel5T9vtdBN72PJ+cjC4qNHk4Uwvc5sfOBELuibGN0bVu2bwY9nUgSwCiB1iIA== + dependencies: + "@parcel/fs" "2.7.0" + "@parcel/logger" "2.7.0" + "@parcel/utils" "2.7.0" + lmdb "2.5.2" + "@parcel/cache@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.2.1.tgz#dbbfebde0e965aad1ecb1ad384e94abbdf008eb0" @@ -2623,6 +2714,13 @@ "@parcel/utils" "^2.2.1" lmdb "^2.0.2" +"@parcel/codeframe@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.7.0.tgz#b6e4ad6100938edbed1b6c72b37f609e1abaf931" + integrity sha512-UTKx0jejJmmO1dwTHSJuRgrO8N6PMlkxRT6sew8N6NC3Bgv6pu0EbO+RtlWt/jCvzcdLOPdIoTzj4MMZvgcMYg== + dependencies: + chalk "^4.1.0" + "@parcel/codeframe@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.2.1.tgz#85be653fab034482fc940786f862c1afced5c485" @@ -2763,6 +2861,14 @@ "@parcel/css-linux-x64-musl" "1.2.0" "@parcel/css-win32-x64-msvc" "1.2.0" +"@parcel/diagnostic@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.7.0.tgz#cf2596a20ce9277334616e12bbdac98490189e99" + integrity sha512-pdq/cTwVoL0n8yuDCRXFRSQHVWdmmIXPt3R3iT4KtYDYvOrMT2dLPT79IMqQkhYPANW8GuL15n/WxRngfRdkug== + dependencies: + "@mischnic/json-sourcemap" "^0.1.0" + nullthrows "^1.1.1" + "@parcel/diagnostic@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.2.1.tgz#9f75d6c6d9b9705ffbdb5c3f29ed421200e14bb1" @@ -2771,11 +2877,23 @@ json-source-map "^0.6.1" nullthrows "^1.1.1" +"@parcel/events@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.7.0.tgz#b6db8464d45626686134d412d3a36d024ffb1482" + integrity sha512-kQDwMKgZ1U4M/G17qeDYF6bW5kybluN6ajYPc7mZcrWg+trEI/oXi81GMFaMX0BSUhwhbiN5+/Vb2wiG/Sn6ig== + "@parcel/events@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.2.1.tgz#435dcc52e4140ec8dbdc6dc63c1b5a3d50f8507a" integrity sha512-UPHYje/UYu5s6Ax0rs4LwjxSqN37nw0n+RuN5KlqsQl6U8Zdhkpd0LCCERqYR+edEZLxDYqhNMpSOmvbtAl8lw== +"@parcel/fs-search@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.7.0.tgz#15e658006039ddc7b92528df5266ee2b9c47b6a4" + integrity sha512-K1Hv25bnRpwQVA15RvcRuB8ZhfclnCHA8N8L6w7Ul1ncSJDxCIkIAc5hAubYNNYW3kWjCC2SOaEgFKnbvMllEQ== + dependencies: + detect-libc "^1.0.3" + "@parcel/fs-search@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.2.1.tgz#05d63dd5e95cc6aeac3095b90b70646e76d42258" @@ -2793,6 +2911,17 @@ imurmurhash "^0.1.4" readable-stream "1 || 2" +"@parcel/fs@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.7.0.tgz#c9a0c60bdbef7101ff47f2db6b23814c3db06007" + integrity sha512-PU5fo4Hh8y03LZgemgVREttc0wyHQUNmsJCybxTB7EjJie2CqJRumo+DFppArlvdchLwJdc9em03yQV/GNWrEg== + dependencies: + "@parcel/fs-search" "2.7.0" + "@parcel/types" "2.7.0" + "@parcel/utils" "2.7.0" + "@parcel/watcher" "^2.0.0" + "@parcel/workers" "2.7.0" + "@parcel/fs@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.2.1.tgz#ca5e68a2100c55d1451988811df2106ac52f6f46" @@ -2819,6 +2948,14 @@ "@parcel/utils" "^2.2.1" nullthrows "^1.1.1" +"@parcel/hash@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.7.0.tgz#8825cff69a0bc4816737415e6e2aa29e8671c0b1" + integrity sha512-k6bSKnIlPJMPU3yjQzfgfvF9zuJZGOAlJgzpL4BbWvdbE8BTdjzLcFn0Ujrtud94EgIkiXd22sC2HpCUWoHGdA== + dependencies: + detect-libc "^1.0.3" + xxhash-wasm "^0.4.2" + "@parcel/hash@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.2.1.tgz#debb6a321e4f5e81f224ca7d36e7c575abb8b7af" @@ -2827,6 +2964,14 @@ detect-libc "^1.0.3" xxhash-wasm "^0.4.2" +"@parcel/logger@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.7.0.tgz#1aa1de0458bdd613714ce4031134d92135aec590" + integrity sha512-qjMY/bYo38+o+OiIrTRldU9CwL1E7J72t+xkTP8QIcUxLWz5LYR0YbynZUVulmBSfqsykjjxCy4a+8siVr+lPw== + dependencies: + "@parcel/diagnostic" "2.7.0" + "@parcel/events" "2.7.0" + "@parcel/logger@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.2.1.tgz#d13d3b093a34389fa8eb8204c43ce06e997d75fe" @@ -2835,6 +2980,13 @@ "@parcel/diagnostic" "^2.2.1" "@parcel/events" "^2.2.1" +"@parcel/markdown-ansi@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.7.0.tgz#4ba70e3661ce06cd8fd2eb3f7b84028853a586e4" + integrity sha512-ipOX0D6FVZFEXeb/z8MnTMq2RQEIuaILY90olVIuHEFLHHfOPEn+RK3u13HA1ChF5/9E3cMD79tu6x9JL9Kqag== + dependencies: + chalk "^4.1.0" + "@parcel/markdown-ansi@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.2.1.tgz#5257c17779153780f1569bdbd2120139bbb3b29e" @@ -2912,6 +3064,16 @@ cssnano "^5.0.15" postcss "^8.4.5" +"@parcel/optimizer-data-url@2.2.1", "@parcel/optimizer-data-url@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@parcel/optimizer-data-url/-/optimizer-data-url-2.2.1.tgz#69e2bc7bb5164a82d9044a26758464a12c76e993" + integrity sha512-e1gbnGpc2wKGUmXEMXK8FfPGBjE1Ols3CQe06FUzq5dxocctcoEBdZas/cBew+b5LmuHqzTv4rYNWMqQnr7Izw== + dependencies: + "@parcel/plugin" "^2.2.1" + "@parcel/utils" "^2.2.1" + isbinaryfile "^4.0.2" + mime "^2.4.4" + "@parcel/optimizer-htmlnano@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.2.1.tgz#781267e8b72033abc500e16ca032d24d56d7f2ce" @@ -2956,6 +3118,19 @@ nullthrows "^1.1.1" terser "^5.2.0" +"@parcel/package-manager@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.7.0.tgz#5de1bf5c94d95330e98dffb2a66c22d1f20c4c8a" + integrity sha512-wmfSX1mRrTi8MeA4KrnPk/x7zGUsILCQmTo6lA4gygzAxDbM1pGuyFN8/Kt0y0SFO2lbljARtD/4an5qdotH+Q== + dependencies: + "@parcel/diagnostic" "2.7.0" + "@parcel/fs" "2.7.0" + "@parcel/logger" "2.7.0" + "@parcel/types" "2.7.0" + "@parcel/utils" "2.7.0" + "@parcel/workers" "2.7.0" + semver "^5.7.1" + "@parcel/package-manager@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.2.1.tgz#921753047db17c273f462121961992eecf41d02c" @@ -3032,6 +3207,13 @@ dependencies: "@parcel/plugin" "^2.2.1" +"@parcel/plugin@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.7.0.tgz#0211281025d02afbc5a23fba237b7aae02e34e51" + integrity sha512-qqgx+nnMn6/0lRc4lKbLGmhNtBiT93S2gFNB4Eb4Pfz/SxVYoW+fmml+KdfOSiZffWOAH5L6NwhyD7N8aSikzw== + dependencies: + "@parcel/types" "2.7.0" + "@parcel/plugin@^2.1.1", "@parcel/plugin@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.2.1.tgz#14d46cababae45d89afcf4a26b67880870d4fcfc" @@ -3191,6 +3373,13 @@ "@parcel/workers" "^2.2.1" nullthrows "^1.1.1" +"@parcel/transformer-inline-string@2.2.1", "@parcel/transformer-inline-string@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@parcel/transformer-inline-string/-/transformer-inline-string-2.2.1.tgz#a80a8a0221803b863e103340ea2e3b6546de14f3" + integrity sha512-yHhKmYEEyg3D5FfAz/yv+U4Ml6MPJvYfEgFowfeCTG2cJ9g7jVwsB66nAwOR1IP+MJh9ODmzf5OSjdR9MX6lYQ== + dependencies: + "@parcel/plugin" "^2.2.1" + "@parcel/transformer-inline@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/transformer-inline/-/transformer-inline-2.2.1.tgz#626cea8c83ae0b8ae9e4070f9aa9255ac1273f86" @@ -3310,6 +3499,19 @@ dependencies: nullthrows "^1.1.1" +"@parcel/types@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.7.0.tgz#c89e95964339324c1931ef7a17906a72291d6b73" + integrity sha512-+dhXVUnseTCpJvBTGMp0V6X13z6O/A/+CUtwEpMGZ8XSmZ4Gk44GvaTiBOp0bJpWG4fvCKp+UmC8PYbrDiiziw== + dependencies: + "@parcel/cache" "2.7.0" + "@parcel/diagnostic" "2.7.0" + "@parcel/fs" "2.7.0" + "@parcel/package-manager" "2.7.0" + "@parcel/source-map" "^2.0.0" + "@parcel/workers" "2.7.0" + utility-types "^3.10.0" + "@parcel/types@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.2.1.tgz#c27d57dbc5be5bdee18ab22222f731b3de494d4c" @@ -3323,6 +3525,19 @@ "@parcel/workers" "^2.2.1" utility-types "^3.10.0" +"@parcel/utils@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.7.0.tgz#f795d0f43efdd449ab0bbfac3632cd7f3ec0e4dd" + integrity sha512-jNZ5bIGg1r1RDRKi562o4kuVwnz+XJ2Ie3b0Zwrqwvgfj6AbRFIKzDd+h85dWWmcDYzKUbHp11u6VJl1u8Vapg== + dependencies: + "@parcel/codeframe" "2.7.0" + "@parcel/diagnostic" "2.7.0" + "@parcel/hash" "2.7.0" + "@parcel/logger" "2.7.0" + "@parcel/markdown-ansi" "2.7.0" + "@parcel/source-map" "^2.0.0" + chalk "^4.1.0" + "@parcel/utils@^2.1.1", "@parcel/utils@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.2.1.tgz#f32653e81205c0145b8edc7e2d4d853070ad6b02" @@ -3358,6 +3573,18 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" +"@parcel/workers@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.7.0.tgz#d74955d361337127227912a5ab26cb3079ebfc78" + integrity sha512-99VfaOX+89+RaoTSyH9ZQtkMBFZBFMvJmVJ/GeJT6QCd2wtKBStTHlaSnQOkLD/iRjJCNwV2xpZmm8YkTwV+hg== + dependencies: + "@parcel/diagnostic" "2.7.0" + "@parcel/logger" "2.7.0" + "@parcel/types" "2.7.0" + "@parcel/utils" "2.7.0" + chrome-trace-event "^1.0.2" + nullthrows "^1.1.1" + "@parcel/workers@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.2.1.tgz#952c5c208ca29c18a8c8de7eed90d6e3869bae9d" @@ -13560,6 +13787,11 @@ isbinaryfile@^4.0.1: resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.2.tgz#bfc45642da645681c610cca831022e30af426488" integrity sha512-C3FSxJdNrEr2F4z6uFtNzECDM5hXk+46fxaa+cwBe5/XrWSmzdG8DDgyjfX6/NRdBB21q2JXuRAzPCUs+fclnQ== +isbinaryfile@^4.0.2: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -14321,7 +14553,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.1.3, json5@^2.2.0: +json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== @@ -14730,6 +14962,24 @@ listr@0.14.3: p-map "^2.0.0" rxjs "^6.3.3" +lmdb@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.5.2.tgz#37e28a9fb43405f4dc48c44cec0e13a14c4a6ff1" + integrity sha512-V5V5Xa2Hp9i2XsbDALkBTeHXnBXh/lEmk9p22zdr7jtuOIY9TGhjK6vAvTpOOx9IKU4hJkRWZxn/HsvR1ELLtA== + dependencies: + msgpackr "^1.5.4" + node-addon-api "^4.3.0" + node-gyp-build-optional-packages "5.0.3" + ordered-binary "^1.2.4" + weak-lru-cache "^1.2.2" + optionalDependencies: + "@lmdb/lmdb-darwin-arm64" "2.5.2" + "@lmdb/lmdb-darwin-x64" "2.5.2" + "@lmdb/lmdb-linux-arm" "2.5.2" + "@lmdb/lmdb-linux-arm64" "2.5.2" + "@lmdb/lmdb-linux-x64" "2.5.2" + "@lmdb/lmdb-win32-x64" "2.5.2" + lmdb@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.0.2.tgz#bdd78a686a4423cf2aaea38fb2acebbd1aca9f02" @@ -16481,6 +16731,20 @@ msgpackr-extract@^1.0.14: nan "^2.14.2" node-gyp-build "^4.2.3" +msgpackr-extract@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz#56272030f3e163e1b51964ef8b1cd5e7240c03ed" + integrity sha512-cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA== + dependencies: + node-gyp-build-optional-packages "5.0.3" + optionalDependencies: + "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.1.2" + "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.1.2" + "@msgpackr-extract/msgpackr-extract-linux-arm" "2.1.2" + "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.1.2" + "@msgpackr-extract/msgpackr-extract-linux-x64" "2.1.2" + "@msgpackr-extract/msgpackr-extract-win32-x64" "2.1.2" + msgpackr@^1.5.0, msgpackr@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.5.1.tgz#2a8e39d25458406034b8cb50dc7d6a7abd3dfff2" @@ -16488,6 +16752,13 @@ msgpackr@^1.5.0, msgpackr@^1.5.1: optionalDependencies: msgpackr-extract "^1.0.14" +msgpackr@^1.5.4: + version "1.6.3" + resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.6.3.tgz#8ea3fb3d1de37d003c0e22edc0d2b6e8f3bd9de9" + integrity sha512-Wtwnt2W06wNOLzV3N0XLLAJCxpwlCfFpvSZAXsu+xf71X7KuqBEDhDSjAy9nwNhQ2aK74Rd1RiRln+62tffoXw== + optionalDependencies: + msgpackr-extract "^2.0.2" + multimatch@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b" @@ -16660,7 +16931,7 @@ node-addon-api@^3.2.1: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== -node-addon-api@^4.2.0: +node-addon-api@^4.2.0, node-addon-api@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== @@ -16706,6 +16977,11 @@ node-forge@^1.2.1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w== +node-gyp-build-optional-packages@5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17" + integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA== + node-gyp-build@^4.2.3, node-gyp-build@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" @@ -17354,6 +17630,11 @@ ordered-binary@^1.1.0: resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.2.2.tgz#76b27c8c7c6fa09eded9d06f684b9f2721f95307" integrity sha512-fs9eFLmnFleZNi9oPp/XJdUjUuX90ucllnreN10boTKVje4U2QGjadxl1WAxCmBQRpvSMdALPN34ubDjFGeLyg== +ordered-binary@^1.2.4: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.3.0.tgz#a116d64c923278216e335602d279750b2ebd746e" + integrity sha512-knIeYepTI6BDAzGxqFEDGtI/iGqs57H32CInAIxEvAHG46vk1Di0CEpyc1A7iY39B1mfik3g3KLYwOTNnnMHLA== + ordered-read-streams@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" @@ -23350,6 +23631,11 @@ weak-lru-cache@^1.1.0: resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.0.tgz#9f18a0e622b73a22ec5ea6a585b3d90d834e7126" integrity sha512-/m09N7scntxHqtypoF+1KJnHYntYTwVXAq3y2P3YPNIMyKexGPVCs/DTm/nS1NhD0max+sLvIPJacSeNFQ9lNg== +weak-lru-cache@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz#fdbb6741f36bae9540d12f480ce8254060dccd19" + integrity sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw== + web-namespaces@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" From 20bc0aa42c777c82070d89dc7c9505bcafaa573f Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Wed, 21 Sep 2022 10:03:29 -0700 Subject: [PATCH 05/10] Show menu chevron for resize only --- packages/@react-spectrum/table/src/TableView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx index e241c473b4a..8d3091ad034 100644 --- a/packages/@react-spectrum/table/src/TableView.tsx +++ b/packages/@react-spectrum/table/src/TableView.tsx @@ -17,7 +17,7 @@ import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium'; import {classNames, useDOMRef, useFocusableRef, useStyleProps, useUnwrapDOMRef} from '@react-spectrum/utils'; import {DOMRef, FocusableRef, MoveMoveEvent} from '@react-types/shared'; import {FocusRing, FocusScope, useFocusRing} from '@react-aria/focus'; -import {getInteractionModality, useFocusWithin, useHover, usePress} from '@react-aria/interactions'; +import {getInteractionModality, isFocusVisible, useFocusWithin, useHover, usePress} from '@react-aria/interactions'; import {GridNode} from '@react-types/grid'; // @ts-ignore import intlMessages from '../intl/*.json'; @@ -682,7 +682,7 @@ function ResizableTableColumnHeader(props) { 'is-sorted-desc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'descending', 'is-sorted-asc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'ascending', 'is-hovered': isHovered, - 'is-cell-focused': isFocused, + 'is-cell-focused': isFocused && isFocusVisible(), 'spectrum-Table-cell--hideHeader': columnProps.hideHeader }, classNames( @@ -705,7 +705,7 @@ function ResizableTableColumnHeader(props) { column.rendered } { - columnProps.allowsSorting && + columnProps.allowsSorting || columnProps.allowsResizing && } From 662b4823b766ff8f7a4580b4ae436e6b7838d37c Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Wed, 21 Sep 2022 11:33:11 -0700 Subject: [PATCH 06/10] only show chevron for menus --- packages/@react-spectrum/table/src/TableView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx index 8d3091ad034..7b015de10c7 100644 --- a/packages/@react-spectrum/table/src/TableView.tsx +++ b/packages/@react-spectrum/table/src/TableView.tsx @@ -705,7 +705,7 @@ function ResizableTableColumnHeader(props) { column.rendered } { - columnProps.allowsSorting || columnProps.allowsResizing && + columnProps.allowsResizing && } From 64c31b1a6bc7b120a9e8f9a92f4e652ed8eb744c Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Thu, 22 Sep 2022 15:32:41 -0700 Subject: [PATCH 07/10] fix webpack not processing css files --- .chromatic/webpack-chromatic.config.js | 3 - .storybook/css-url-rename-plugin/loader.js | 10 - .storybook/webpack-storybook.config.js | 3 - Makefile | 3 +- lib/postcss-inline-svgs.js | 24 ++ package.json | 20 +- postcss.config.js | 1 + yarn.lock | 268 +-------------------- 8 files changed, 39 insertions(+), 293 deletions(-) delete mode 100644 .storybook/css-url-rename-plugin/loader.js create mode 100644 lib/postcss-inline-svgs.js diff --git a/.chromatic/webpack-chromatic.config.js b/.chromatic/webpack-chromatic.config.js index 77934f78863..ee618abd0b9 100644 --- a/.chromatic/webpack-chromatic.config.js +++ b/.chromatic/webpack-chromatic.config.js @@ -63,9 +63,6 @@ module.exports = () => { ident: 'postcss', plugins: require('../postcss.config').plugins } - }, - { - loader: path.resolve(__dirname, '../.storybook/css-url-rename-plugin/loader.js') } ], include: path.resolve(__dirname, '../') diff --git a/.storybook/css-url-rename-plugin/loader.js b/.storybook/css-url-rename-plugin/loader.js deleted file mode 100644 index 2c760fa7bdd..00000000000 --- a/.storybook/css-url-rename-plugin/loader.js +++ /dev/null @@ -1,10 +0,0 @@ - -function loader(source) { - // Apply some transformations to the source... - if (source.indexOf(/data-url:/ig) > -1) { - source = source.replace(/data-url:/ig, ''); - } - return source; -} - -exports.default = loader; diff --git a/.storybook/webpack-storybook.config.js b/.storybook/webpack-storybook.config.js index 0b0e6468a16..58435bea8b9 100644 --- a/.storybook/webpack-storybook.config.js +++ b/.storybook/webpack-storybook.config.js @@ -60,9 +60,6 @@ module.exports = () => { ident: 'postcss', plugins: require('../postcss.config').plugins } - }, - { - loader: path.resolve(__dirname, './css-url-rename-plugin/loader.js') } ], include: path.resolve(__dirname, '../') diff --git a/Makefile b/Makefile index 0a13d2dd222..c7b38d40a4b 100644 --- a/Makefile +++ b/Makefile @@ -82,11 +82,12 @@ publish-nightly: build yarn publish:nightly build: - parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ --no-optimize + BUILD_TOOL=parcel parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ --no-optimize website: yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs website-production: + BUILD_TOOL=parcel node scripts/buildWebsite.js cp packages/dev/docs/pages/robots.txt dist/production/docs/robots.txt diff --git a/lib/postcss-inline-svgs.js b/lib/postcss-inline-svgs.js new file mode 100644 index 00000000000..783376b2339 --- /dev/null +++ b/lib/postcss-inline-svgs.js @@ -0,0 +1,24 @@ +/* +Copyright 2019 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ +let postcss = require('postcss'); + +module.exports = postcss.plugin('postcss-inline-svgs', function () { + return function (root) { + root.walkRules((rule) => { + rule.walkDecls((decl) => { + if (process.env.BUILD_TOOL === 'webpack' && decl.value.indexOf('data-url:') > -1) { + decl.value = decl.value.replace('data-url:', ''); + } + }); + }); + }; +}); diff --git a/package.json b/package.json index ac318685a55..e3a37bf0867 100644 --- a/package.json +++ b/package.json @@ -11,15 +11,15 @@ "check-types": "tsc && tsc-strict", "install-16": "yarn add -W react@^16.8.0 react-dom@^16.8.0 @testing-library/react@^12 @testing-library/react-hooks@^8", "install-17": "yarn add -W react@^17 react-dom@^17 @testing-library/react@^12 @testing-library/react-hooks@^8", - "start": "cross-env NODE_ENV=storybook start-storybook -p 9003 --ci -c '.storybook'", - "start-strict": "cross-env NODE_ENV=storybook STRICT_MODE=1 start-storybook -p 9003 --ci -c '.storybook'", - "build:storybook": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", - "build:storybook-16": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", - "build:storybook-17": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", - "start:chromatic": "CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", - "build:chromatic": "CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", - "start:docs": "DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", - "build:docs": "DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "start": "cross-env NODE_ENV=storybook BUILD_TOOL=webpack start-storybook -p 9003 --ci -c '.storybook'", + "start-strict": "cross-env NODE_ENV=storybook BUILD_TOOL=webpack STRICT_MODE=1 start-storybook -p 9003 --ci -c '.storybook'", + "build:storybook": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", + "build:storybook-16": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", + "build:storybook-17": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", + "start:chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", + "build:chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", + "start:docs": "cross-env BUILD_TOOL=parcel DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "build:docs": "cross-env BUILD_TOOL=parcel DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", "test": "yarn jest", "test-strict": "cross-env STRICT_MODE=1 yarn jest", "build": "make build", @@ -33,7 +33,7 @@ "clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js", "postinstall": "yarn build:icons && patch-package", "plop": "plop --plopfile scripts/plopfile.js", - "chromatic": "CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", + "chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", "merge:css": "babel-node --presets @babel/env ./scripts/merge-spectrum-css.js", "release": "lerna publish from-package --yes", "publish:nightly": "lerna publish -y --canary --preid nightly --dist-tag=nightly --exact --force-publish=* --no-push", diff --git a/postcss.config.js b/postcss.config.js index 74df3e7bc21..16453e318d2 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -16,6 +16,7 @@ module.exports = { [ require("postcss-logical")(), require("postcss-dir-pseudo-class")(), + require("./lib/postcss-inline-svgs"), // Use the hover media query in the docs because of SSR - some components have no client JS available. // Otherwise, convert :hover to .is-hovered. diff --git a/yarn.lock b/yarn.lock index 9b10f961227..561a822870a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2324,48 +2324,6 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" -"@lezer/common@^0.15.0", "@lezer/common@^0.15.7": - version "0.15.12" - resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.15.12.tgz#2f21aec551dd5fd7d24eb069f90f54d5bc6ee5e9" - integrity sha512-edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig== - -"@lezer/lr@^0.15.4": - version "0.15.8" - resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.15.8.tgz#1564a911e62b0a0f75ca63794a6aa8c5dc63db21" - integrity sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg== - dependencies: - "@lezer/common" "^0.15.0" - -"@lmdb/lmdb-darwin-arm64@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.5.2.tgz#bc66fa43286b5c082e8fee0eacc17995806b6fbe" - integrity sha512-+F8ioQIUN68B4UFiIBYu0QQvgb9FmlKw2ctQMSBfW2QBrZIxz9vD9jCGqTCPqZBRbPHAS/vG1zSXnKqnS2ch/A== - -"@lmdb/lmdb-darwin-x64@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.5.2.tgz#89d8390041bce6bab24a82a20392be22faf54ffc" - integrity sha512-KvPH56KRLLx4KSfKBx0m1r7GGGUMXm0jrKmNE7plbHlesZMuPJICtn07HYgQhj1LNsK7Yqwuvnqh1QxhJnF1EA== - -"@lmdb/lmdb-linux-arm64@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.5.2.tgz#14fe4c96c2bb1285f93797f45915fa35ee047268" - integrity sha512-aLl89VHL/wjhievEOlPocoefUyWdvzVrcQ/MHQYZm2JfV1jUsrbr/ZfkPPUFvZBf+VSE+Q0clWs9l29PCX1hTQ== - -"@lmdb/lmdb-linux-arm@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.5.2.tgz#05bde4573ab10cf21827339fe687148f2590cfa1" - integrity sha512-5kQAP21hAkfW5Bl+e0P57dV4dGYnkNIpR7f/GAh6QHlgXx+vp/teVj4PGRZaKAvt0GX6++N6hF8NnGElLDuIDw== - -"@lmdb/lmdb-linux-x64@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.5.2.tgz#d2f85afd857d2c33d2caa5b057944574edafcfee" - integrity sha512-xUdUfwDJLGjOUPH3BuPBt0NlIrR7f/QHKgu3GZIXswMMIihAekj2i97oI0iWG5Bok/b+OBjHPfa8IU9velnP/Q== - -"@lmdb/lmdb-win32-x64@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.5.2.tgz#28f643fbc0bec30b07fbe95b137879b6b4d1c9c5" - integrity sha512-zrBczSbXKxEyK2ijtbRdICDygRqWSRPpZMN5dD1T8VMEW5RIhIbwFWw2phDRXuBQdVDpSjalCIUMWMV2h3JaZA== - "@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" @@ -2427,15 +2385,6 @@ resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA== -"@mischnic/json-sourcemap@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz#38af657be4108140a548638267d02a2ea3336507" - integrity sha512-dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA== - dependencies: - "@lezer/common" "^0.15.7" - "@lezer/lr" "^0.15.4" - json5 "^2.2.1" - "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -2444,36 +2393,6 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz#9571b87be3a3f2c46de05585470bc4f3af2f6f00" - integrity sha512-TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ== - -"@msgpackr-extract/msgpackr-extract-darwin-x64@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz#bfbc6936ede2955218f5621a675679a5fe8e6f4c" - integrity sha512-YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few== - -"@msgpackr-extract/msgpackr-extract-linux-arm64@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz#22555e28382af2922e7450634c8a2f240bb9eb82" - integrity sha512-vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg== - -"@msgpackr-extract/msgpackr-extract-linux-arm@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz#ffb6ae1beea7ac572b6be6bf2a8e8162ebdd8be7" - integrity sha512-42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA== - -"@msgpackr-extract/msgpackr-extract-linux-x64@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz#7caf62eebbfb1345de40f75e89666b3d4194755f" - integrity sha512-RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg== - -"@msgpackr-extract/msgpackr-extract-win32-x64@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz#f2d8b9ddd8d191205ed26ce54aba3dfc5ae3e7c9" - integrity sha512-rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw== - "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents": version "2.1.8-no-fsevents" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz#da7c3996b8e6e19ebd14d82eaced2313e7769f9b" @@ -2694,16 +2613,6 @@ "@parcel/utils" "^2.2.1" nullthrows "^1.1.1" -"@parcel/cache@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.7.0.tgz#cc4b99685c7ff0fc20fbc321f4b6850d6e0c6811" - integrity sha512-JlXNoZXcWzLKdDlfeF3dIj5Vtel5T9vtdBN72PJ+cjC4qNHk4Uwvc5sfOBELuibGN0bVu2bwY9nUgSwCiB1iIA== - dependencies: - "@parcel/fs" "2.7.0" - "@parcel/logger" "2.7.0" - "@parcel/utils" "2.7.0" - lmdb "2.5.2" - "@parcel/cache@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/cache/-/cache-2.2.1.tgz#dbbfebde0e965aad1ecb1ad384e94abbdf008eb0" @@ -2714,13 +2623,6 @@ "@parcel/utils" "^2.2.1" lmdb "^2.0.2" -"@parcel/codeframe@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.7.0.tgz#b6e4ad6100938edbed1b6c72b37f609e1abaf931" - integrity sha512-UTKx0jejJmmO1dwTHSJuRgrO8N6PMlkxRT6sew8N6NC3Bgv6pu0EbO+RtlWt/jCvzcdLOPdIoTzj4MMZvgcMYg== - dependencies: - chalk "^4.1.0" - "@parcel/codeframe@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/codeframe/-/codeframe-2.2.1.tgz#85be653fab034482fc940786f862c1afced5c485" @@ -2861,14 +2763,6 @@ "@parcel/css-linux-x64-musl" "1.2.0" "@parcel/css-win32-x64-msvc" "1.2.0" -"@parcel/diagnostic@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.7.0.tgz#cf2596a20ce9277334616e12bbdac98490189e99" - integrity sha512-pdq/cTwVoL0n8yuDCRXFRSQHVWdmmIXPt3R3iT4KtYDYvOrMT2dLPT79IMqQkhYPANW8GuL15n/WxRngfRdkug== - dependencies: - "@mischnic/json-sourcemap" "^0.1.0" - nullthrows "^1.1.1" - "@parcel/diagnostic@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/diagnostic/-/diagnostic-2.2.1.tgz#9f75d6c6d9b9705ffbdb5c3f29ed421200e14bb1" @@ -2877,23 +2771,11 @@ json-source-map "^0.6.1" nullthrows "^1.1.1" -"@parcel/events@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.7.0.tgz#b6db8464d45626686134d412d3a36d024ffb1482" - integrity sha512-kQDwMKgZ1U4M/G17qeDYF6bW5kybluN6ajYPc7mZcrWg+trEI/oXi81GMFaMX0BSUhwhbiN5+/Vb2wiG/Sn6ig== - "@parcel/events@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/events/-/events-2.2.1.tgz#435dcc52e4140ec8dbdc6dc63c1b5a3d50f8507a" integrity sha512-UPHYje/UYu5s6Ax0rs4LwjxSqN37nw0n+RuN5KlqsQl6U8Zdhkpd0LCCERqYR+edEZLxDYqhNMpSOmvbtAl8lw== -"@parcel/fs-search@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.7.0.tgz#15e658006039ddc7b92528df5266ee2b9c47b6a4" - integrity sha512-K1Hv25bnRpwQVA15RvcRuB8ZhfclnCHA8N8L6w7Ul1ncSJDxCIkIAc5hAubYNNYW3kWjCC2SOaEgFKnbvMllEQ== - dependencies: - detect-libc "^1.0.3" - "@parcel/fs-search@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/fs-search/-/fs-search-2.2.1.tgz#05d63dd5e95cc6aeac3095b90b70646e76d42258" @@ -2911,17 +2793,6 @@ imurmurhash "^0.1.4" readable-stream "1 || 2" -"@parcel/fs@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.7.0.tgz#c9a0c60bdbef7101ff47f2db6b23814c3db06007" - integrity sha512-PU5fo4Hh8y03LZgemgVREttc0wyHQUNmsJCybxTB7EjJie2CqJRumo+DFppArlvdchLwJdc9em03yQV/GNWrEg== - dependencies: - "@parcel/fs-search" "2.7.0" - "@parcel/types" "2.7.0" - "@parcel/utils" "2.7.0" - "@parcel/watcher" "^2.0.0" - "@parcel/workers" "2.7.0" - "@parcel/fs@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/fs/-/fs-2.2.1.tgz#ca5e68a2100c55d1451988811df2106ac52f6f46" @@ -2948,14 +2819,6 @@ "@parcel/utils" "^2.2.1" nullthrows "^1.1.1" -"@parcel/hash@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.7.0.tgz#8825cff69a0bc4816737415e6e2aa29e8671c0b1" - integrity sha512-k6bSKnIlPJMPU3yjQzfgfvF9zuJZGOAlJgzpL4BbWvdbE8BTdjzLcFn0Ujrtud94EgIkiXd22sC2HpCUWoHGdA== - dependencies: - detect-libc "^1.0.3" - xxhash-wasm "^0.4.2" - "@parcel/hash@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/hash/-/hash-2.2.1.tgz#debb6a321e4f5e81f224ca7d36e7c575abb8b7af" @@ -2964,14 +2827,6 @@ detect-libc "^1.0.3" xxhash-wasm "^0.4.2" -"@parcel/logger@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.7.0.tgz#1aa1de0458bdd613714ce4031134d92135aec590" - integrity sha512-qjMY/bYo38+o+OiIrTRldU9CwL1E7J72t+xkTP8QIcUxLWz5LYR0YbynZUVulmBSfqsykjjxCy4a+8siVr+lPw== - dependencies: - "@parcel/diagnostic" "2.7.0" - "@parcel/events" "2.7.0" - "@parcel/logger@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/logger/-/logger-2.2.1.tgz#d13d3b093a34389fa8eb8204c43ce06e997d75fe" @@ -2980,13 +2835,6 @@ "@parcel/diagnostic" "^2.2.1" "@parcel/events" "^2.2.1" -"@parcel/markdown-ansi@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.7.0.tgz#4ba70e3661ce06cd8fd2eb3f7b84028853a586e4" - integrity sha512-ipOX0D6FVZFEXeb/z8MnTMq2RQEIuaILY90olVIuHEFLHHfOPEn+RK3u13HA1ChF5/9E3cMD79tu6x9JL9Kqag== - dependencies: - chalk "^4.1.0" - "@parcel/markdown-ansi@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/markdown-ansi/-/markdown-ansi-2.2.1.tgz#5257c17779153780f1569bdbd2120139bbb3b29e" @@ -3118,19 +2966,6 @@ nullthrows "^1.1.1" terser "^5.2.0" -"@parcel/package-manager@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.7.0.tgz#5de1bf5c94d95330e98dffb2a66c22d1f20c4c8a" - integrity sha512-wmfSX1mRrTi8MeA4KrnPk/x7zGUsILCQmTo6lA4gygzAxDbM1pGuyFN8/Kt0y0SFO2lbljARtD/4an5qdotH+Q== - dependencies: - "@parcel/diagnostic" "2.7.0" - "@parcel/fs" "2.7.0" - "@parcel/logger" "2.7.0" - "@parcel/types" "2.7.0" - "@parcel/utils" "2.7.0" - "@parcel/workers" "2.7.0" - semver "^5.7.1" - "@parcel/package-manager@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/package-manager/-/package-manager-2.2.1.tgz#921753047db17c273f462121961992eecf41d02c" @@ -3207,13 +3042,6 @@ dependencies: "@parcel/plugin" "^2.2.1" -"@parcel/plugin@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.7.0.tgz#0211281025d02afbc5a23fba237b7aae02e34e51" - integrity sha512-qqgx+nnMn6/0lRc4lKbLGmhNtBiT93S2gFNB4Eb4Pfz/SxVYoW+fmml+KdfOSiZffWOAH5L6NwhyD7N8aSikzw== - dependencies: - "@parcel/types" "2.7.0" - "@parcel/plugin@^2.1.1", "@parcel/plugin@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.2.1.tgz#14d46cababae45d89afcf4a26b67880870d4fcfc" @@ -3499,19 +3327,6 @@ dependencies: nullthrows "^1.1.1" -"@parcel/types@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.7.0.tgz#c89e95964339324c1931ef7a17906a72291d6b73" - integrity sha512-+dhXVUnseTCpJvBTGMp0V6X13z6O/A/+CUtwEpMGZ8XSmZ4Gk44GvaTiBOp0bJpWG4fvCKp+UmC8PYbrDiiziw== - dependencies: - "@parcel/cache" "2.7.0" - "@parcel/diagnostic" "2.7.0" - "@parcel/fs" "2.7.0" - "@parcel/package-manager" "2.7.0" - "@parcel/source-map" "^2.0.0" - "@parcel/workers" "2.7.0" - utility-types "^3.10.0" - "@parcel/types@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.2.1.tgz#c27d57dbc5be5bdee18ab22222f731b3de494d4c" @@ -3525,19 +3340,6 @@ "@parcel/workers" "^2.2.1" utility-types "^3.10.0" -"@parcel/utils@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.7.0.tgz#f795d0f43efdd449ab0bbfac3632cd7f3ec0e4dd" - integrity sha512-jNZ5bIGg1r1RDRKi562o4kuVwnz+XJ2Ie3b0Zwrqwvgfj6AbRFIKzDd+h85dWWmcDYzKUbHp11u6VJl1u8Vapg== - dependencies: - "@parcel/codeframe" "2.7.0" - "@parcel/diagnostic" "2.7.0" - "@parcel/hash" "2.7.0" - "@parcel/logger" "2.7.0" - "@parcel/markdown-ansi" "2.7.0" - "@parcel/source-map" "^2.0.0" - chalk "^4.1.0" - "@parcel/utils@^2.1.1", "@parcel/utils@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/utils/-/utils-2.2.1.tgz#f32653e81205c0145b8edc7e2d4d853070ad6b02" @@ -3573,18 +3375,6 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@parcel/workers@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.7.0.tgz#d74955d361337127227912a5ab26cb3079ebfc78" - integrity sha512-99VfaOX+89+RaoTSyH9ZQtkMBFZBFMvJmVJ/GeJT6QCd2wtKBStTHlaSnQOkLD/iRjJCNwV2xpZmm8YkTwV+hg== - dependencies: - "@parcel/diagnostic" "2.7.0" - "@parcel/logger" "2.7.0" - "@parcel/types" "2.7.0" - "@parcel/utils" "2.7.0" - chrome-trace-event "^1.0.2" - nullthrows "^1.1.1" - "@parcel/workers@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@parcel/workers/-/workers-2.2.1.tgz#952c5c208ca29c18a8c8de7eed90d6e3869bae9d" @@ -14553,7 +14343,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.1: +json5@^2.1.2, json5@^2.1.3, json5@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== @@ -14962,24 +14752,6 @@ listr@0.14.3: p-map "^2.0.0" rxjs "^6.3.3" -lmdb@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.5.2.tgz#37e28a9fb43405f4dc48c44cec0e13a14c4a6ff1" - integrity sha512-V5V5Xa2Hp9i2XsbDALkBTeHXnBXh/lEmk9p22zdr7jtuOIY9TGhjK6vAvTpOOx9IKU4hJkRWZxn/HsvR1ELLtA== - dependencies: - msgpackr "^1.5.4" - node-addon-api "^4.3.0" - node-gyp-build-optional-packages "5.0.3" - ordered-binary "^1.2.4" - weak-lru-cache "^1.2.2" - optionalDependencies: - "@lmdb/lmdb-darwin-arm64" "2.5.2" - "@lmdb/lmdb-darwin-x64" "2.5.2" - "@lmdb/lmdb-linux-arm" "2.5.2" - "@lmdb/lmdb-linux-arm64" "2.5.2" - "@lmdb/lmdb-linux-x64" "2.5.2" - "@lmdb/lmdb-win32-x64" "2.5.2" - lmdb@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.0.2.tgz#bdd78a686a4423cf2aaea38fb2acebbd1aca9f02" @@ -16731,20 +16503,6 @@ msgpackr-extract@^1.0.14: nan "^2.14.2" node-gyp-build "^4.2.3" -msgpackr-extract@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz#56272030f3e163e1b51964ef8b1cd5e7240c03ed" - integrity sha512-cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA== - dependencies: - node-gyp-build-optional-packages "5.0.3" - optionalDependencies: - "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.1.2" - "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.1.2" - "@msgpackr-extract/msgpackr-extract-linux-arm" "2.1.2" - "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.1.2" - "@msgpackr-extract/msgpackr-extract-linux-x64" "2.1.2" - "@msgpackr-extract/msgpackr-extract-win32-x64" "2.1.2" - msgpackr@^1.5.0, msgpackr@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.5.1.tgz#2a8e39d25458406034b8cb50dc7d6a7abd3dfff2" @@ -16752,13 +16510,6 @@ msgpackr@^1.5.0, msgpackr@^1.5.1: optionalDependencies: msgpackr-extract "^1.0.14" -msgpackr@^1.5.4: - version "1.6.3" - resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.6.3.tgz#8ea3fb3d1de37d003c0e22edc0d2b6e8f3bd9de9" - integrity sha512-Wtwnt2W06wNOLzV3N0XLLAJCxpwlCfFpvSZAXsu+xf71X7KuqBEDhDSjAy9nwNhQ2aK74Rd1RiRln+62tffoXw== - optionalDependencies: - msgpackr-extract "^2.0.2" - multimatch@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b" @@ -16931,7 +16682,7 @@ node-addon-api@^3.2.1: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== -node-addon-api@^4.2.0, node-addon-api@^4.3.0: +node-addon-api@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== @@ -16977,11 +16728,6 @@ node-forge@^1.2.1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w== -node-gyp-build-optional-packages@5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17" - integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA== - node-gyp-build@^4.2.3, node-gyp-build@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" @@ -17630,11 +17376,6 @@ ordered-binary@^1.1.0: resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.2.2.tgz#76b27c8c7c6fa09eded9d06f684b9f2721f95307" integrity sha512-fs9eFLmnFleZNi9oPp/XJdUjUuX90ucllnreN10boTKVje4U2QGjadxl1WAxCmBQRpvSMdALPN34ubDjFGeLyg== -ordered-binary@^1.2.4: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.3.0.tgz#a116d64c923278216e335602d279750b2ebd746e" - integrity sha512-knIeYepTI6BDAzGxqFEDGtI/iGqs57H32CInAIxEvAHG46vk1Di0CEpyc1A7iY39B1mfik3g3KLYwOTNnnMHLA== - ordered-read-streams@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" @@ -23631,11 +23372,6 @@ weak-lru-cache@^1.1.0: resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.0.tgz#9f18a0e622b73a22ec5ea6a585b3d90d834e7126" integrity sha512-/m09N7scntxHqtypoF+1KJnHYntYTwVXAq3y2P3YPNIMyKexGPVCs/DTm/nS1NhD0max+sLvIPJacSeNFQ9lNg== -weak-lru-cache@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz#fdbb6741f36bae9540d12f480ce8254060dccd19" - integrity sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw== - web-namespaces@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" From e92ebb199ed2db72edde291bd1b2db993a521e31 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Sat, 24 Sep 2022 11:45:25 -0700 Subject: [PATCH 08/10] restore truncating text --- .../spectrum-css-temp/components/table/index.css | 10 +++++++++- packages/@react-spectrum/table/src/TableView.tsx | 11 +++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/@adobe/spectrum-css-temp/components/table/index.css b/packages/@adobe/spectrum-css-temp/components/table/index.css index a98cc497ba5..a208e0ae3ca 100644 --- a/packages/@adobe/spectrum-css-temp/components/table/index.css +++ b/packages/@adobe/spectrum-css-temp/components/table/index.css @@ -115,7 +115,7 @@ svg.spectrum-Table-sortedIcon { text-overflow: ellipsis; } } - &.is-hovered, + .is-hovered, &.is-cell-focused { .spectrum-Table-menuChevron { display: inline-block; @@ -305,6 +305,14 @@ svg.spectrum-Table-sortedIcon { align-items: center; } +.spectrum-Table-headerCellText { + flex: 0 1 auto; + min-width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .spectrum-Table-headCell, .spectrum-Table-headCellButton { &:focus-ring, diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx index 7b015de10c7..28a498c6d4c 100644 --- a/packages/@react-spectrum/table/src/TableView.tsx +++ b/packages/@react-spectrum/table/src/TableView.tsx @@ -585,8 +585,9 @@ let _TableColumnHeaderButton = (props, ref: FocusableRef) => { let {isEmpty} = useTableContext(); let domRef = useFocusableRef(ref); let {buttonProps} = useButton({...props, elementType: 'div', isDisabled: isEmpty}, domRef); + let {hoverProps, isHovered} = useHover({...props, isDisabled: isEmpty}); return ( -
+
{props.children}
 @@ -608,11 +609,10 @@ function ResizableTableColumnHeader(props) { isVirtualized: true, hasMenu: true }, state, ref); - let {hoverProps, isHovered} = useHover({...props, isDisabled: isEmpty}); let [isFocused, setIsFocused] = useState(false); let {focusWithinProps} = useFocusWithin({onFocusWithinChange: setIsFocused, isDisabled: isEmpty}); - const allProps = [columnHeaderProps, hoverProps, pressProps, focusWithinProps]; + const allProps = [columnHeaderProps, pressProps, focusWithinProps]; let columnProps = column.props as SpectrumColumnProps; @@ -681,7 +681,6 @@ function ResizableTableColumnHeader(props) { 'is-sortable': columnProps.allowsSorting, 'is-sorted-desc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'descending', 'is-sorted-asc': state.sortDescriptor?.column === column.key && state.sortDescriptor?.direction === 'ascending', - 'is-hovered': isHovered, 'is-cell-focused': isFocused && isFocusVisible(), 'spectrum-Table-cell--hideHeader': columnProps.hideHeader }, @@ -702,10 +701,10 @@ function ResizableTableColumnHeader(props) { } {columnProps.hideHeader ? {column.rendered} : - column.rendered +
{column.rendered}
} { - columnProps.allowsResizing && + columnProps.allowsResizing && columnState.currentlyResizingColumn === null && } From c9fe54328fbd14924d49081e0e40b127cf1adf02 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Wed, 12 Oct 2022 12:02:14 -0700 Subject: [PATCH 09/10] remove all webpack changes now that we build with parcel --- Makefile | 3 +-- lib/postcss-inline-svgs.js | 24 ------------------------ package.json | 20 ++++++++++---------- postcss.config.js | 1 - 4 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 lib/postcss-inline-svgs.js diff --git a/Makefile b/Makefile index c7b38d40a4b..0a13d2dd222 100644 --- a/Makefile +++ b/Makefile @@ -82,12 +82,11 @@ publish-nightly: build yarn publish:nightly build: - BUILD_TOOL=parcel parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ --no-optimize + parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ --no-optimize website: yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs website-production: - BUILD_TOOL=parcel node scripts/buildWebsite.js cp packages/dev/docs/pages/robots.txt dist/production/docs/robots.txt diff --git a/lib/postcss-inline-svgs.js b/lib/postcss-inline-svgs.js deleted file mode 100644 index 783376b2339..00000000000 --- a/lib/postcss-inline-svgs.js +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Adobe. All rights reserved. -This file is licensed to you under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under -the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. -*/ -let postcss = require('postcss'); - -module.exports = postcss.plugin('postcss-inline-svgs', function () { - return function (root) { - root.walkRules((rule) => { - rule.walkDecls((decl) => { - if (process.env.BUILD_TOOL === 'webpack' && decl.value.indexOf('data-url:') > -1) { - decl.value = decl.value.replace('data-url:', ''); - } - }); - }); - }; -}); diff --git a/package.json b/package.json index f1759dc8747..4bf8ea03e1a 100644 --- a/package.json +++ b/package.json @@ -11,15 +11,15 @@ "check-types": "tsc && tsc-strict", "install-16": "yarn add -W react@^16.8.0 react-dom@^16.8.0 @testing-library/react@^12 @testing-library/react-hooks@^8", "install-17": "yarn add -W react@^17 react-dom@^17 @testing-library/react@^12 @testing-library/react-hooks@^8", - "start": "cross-env NODE_ENV=storybook BUILD_TOOL=webpack start-storybook -p 9003 --ci -c '.storybook'", - "start-strict": "cross-env NODE_ENV=storybook BUILD_TOOL=webpack STRICT_MODE=1 start-storybook -p 9003 --ci -c '.storybook'", - "build:storybook": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", - "build:storybook-16": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", - "build:storybook-17": "cross-env BUILD_TOOL=webpack build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", - "start:chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", - "build:chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", - "start:docs": "cross-env BUILD_TOOL=parcel DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", - "build:docs": "cross-env BUILD_TOOL=parcel DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "start": "cross-env NODE_ENV=storybook start-storybook -p 9003 --ci -c '.storybook'", + "start-strict": "cross-env NODE_ENV=storybook STRICT_MODE=1 start-storybook -p 9003 --ci -c '.storybook'", + "build:storybook": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", + "build:storybook-16": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", + "build:storybook-17": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", + "start:chromatic": "cross-env CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", + "build:chromatic": "cross-env CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", + "start:docs": "cross-env DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "build:docs": "cross-env DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", "test": "yarn jest", "test-strict": "cross-env STRICT_MODE=1 yarn jest", "build": "make build", @@ -33,7 +33,7 @@ "clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js", "postinstall": "yarn build:icons && patch-package", "plop": "plop --plopfile scripts/plopfile.js", - "chromatic": "cross-env BUILD_TOOL=webpack CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", + "chromatic": "cross-env CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", "merge:css": "babel-node --presets @babel/env ./scripts/merge-spectrum-css.js", "release": "lerna publish from-package --yes", "publish:nightly": "lerna publish -y --canary --preid nightly --dist-tag=nightly --exact --force-publish=* --no-push", diff --git a/postcss.config.js b/postcss.config.js index 16453e318d2..74df3e7bc21 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -16,7 +16,6 @@ module.exports = { [ require("postcss-logical")(), require("postcss-dir-pseudo-class")(), - require("./lib/postcss-inline-svgs"), // Use the hover media query in the docs because of SSR - some components have no client JS available. // Otherwise, convert :hover to .is-hovered. From 57bcdf362f8fd68d7a7c34bc787e03d585413598 Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Wed, 12 Oct 2022 12:03:41 -0700 Subject: [PATCH 10/10] revert package.json changes --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4bf8ea03e1a..538d3c2f7d7 100644 --- a/package.json +++ b/package.json @@ -13,13 +13,13 @@ "install-17": "yarn add -W react@^17 react-dom@^17 @testing-library/react@^12 @testing-library/react-hooks@^8", "start": "cross-env NODE_ENV=storybook start-storybook -p 9003 --ci -c '.storybook'", "start-strict": "cross-env NODE_ENV=storybook STRICT_MODE=1 start-storybook -p 9003 --ci -c '.storybook'", - "build:storybook": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", - "build:storybook-16": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", - "build:storybook-17": "cross-env build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", - "start:chromatic": "cross-env CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", - "build:chromatic": "cross-env CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", - "start:docs": "cross-env DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", - "build:docs": "cross-env DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "build:storybook": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook", + "build:storybook-16": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16", + "build:storybook-17": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17", + "start:chromatic": "CHROMATIC=1 NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'", + "build:chromatic": "CHROMATIC=1 build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic", + "start:docs": "DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", + "build:docs": "DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/@internationalized/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'", "test": "yarn jest", "test-strict": "cross-env STRICT_MODE=1 yarn jest", "build": "make build", @@ -33,7 +33,7 @@ "clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js", "postinstall": "yarn build:icons && patch-package", "plop": "plop --plopfile scripts/plopfile.js", - "chromatic": "cross-env CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", + "chromatic": "CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'", "merge:css": "babel-node --presets @babel/env ./scripts/merge-spectrum-css.js", "release": "lerna publish from-package --yes", "publish:nightly": "lerna publish -y --canary --preid nightly --dist-tag=nightly --exact --force-publish=* --no-push",