Merge branch 'develop' into replace-rollap-postcss-plugin

epam · Nov 13, 2024 · bda6d71 · bda6d71
2 parents 76d7b1d + 0763068
commit bda6d71
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 11 deletions.
diff --git a/app/src/demo/tables/filteredTable/FilteredTable.module.scss b/app/src/demo/tables/filteredTable/FilteredTable.module.scss
@@ -13,8 +13,6 @@
     flex-shrink: 0;
     background-color: var(--uui-surface-main);
     border-bottom: 1px solid var(--uui-divider);
-    overflow-x: auto;
-    overflow-y: hidden;
     align-items: center;
 
     .presets-title {

diff --git a/app/src/docs/_examples/tables/PresetsPanelBasic.example.tsx b/app/src/docs/_examples/tables/PresetsPanelBasic.example.tsx
@@ -133,7 +133,7 @@ export default function PresetsPanelExample() {
 
     return (
         <Panel background="surface-main" shadow style={ { height: '400px' } }>
-            <FlexRow padding="12">
+            <FlexRow padding="12" borderBottom>
                 <PresetsPanel { ...tableStateApi } />
             </FlexRow>
             <DataTable

diff --git a/app/src/docs/_examples/tables/useTableState/useTableState.example.tsx b/app/src/docs/_examples/tables/useTableState/useTableState.example.tsx
@@ -128,7 +128,7 @@ export default function FiltersPanelExample() {
 
     return (
         <Panel background="surface-main" shadow style={ { height: '400px' } }>
-            <FlexRow padding="12">
+            <FlexRow padding="12" borderBottom>
                 <PresetsPanel { ...tableStateApi } />
             </FlexRow>
             <DataTable

diff --git a/app/src/docs/_examples/tooltip/CustomMarkup.example.tsx b/app/src/docs/_examples/tooltip/CustomMarkup.example.tsx
@@ -8,13 +8,13 @@ export default function CustomMarkupExample() {
     ];
     const renderCustomMarkup = () => (
         <>
-            <Text fontSize="14">
+            <Text fontSize="14" size="none" fontWeight="600" lineHeight="18" cx={ css.header }>
                 Copy Workload Based Revenue to Forecast
             </Text>
-            <FlexRow columnGap="12">
+            <FlexRow columnGap="6" vPadding="12">
                 {months.map((month) => (
-                    <FlexCell minWidth={ 60 } cx={ css.textBlock } key={ month }>
-                        <Text fontSize="14" lineHeight="18" cx={ css.text }>
+                    <FlexCell minWidth={ 50 } width="auto" cx={ css.textBlock } key={ month }>
+                        <Text fontSize="14" lineHeight="18" fontWeight="600" cx={ css.text }>
                             {month}
                             {' '}
                             - 22
@@ -30,7 +30,7 @@ export default function CustomMarkupExample() {
 
     return (
         <FlexRow>
-            <Tooltip maxWidth={ 380 } renderContent={ renderCustomMarkup } color="neutral" placement="right">
+            <Tooltip maxWidth={ 500 } renderContent={ renderCustomMarkup } color="neutral" placement="right">
                 <Button data-foo={ 123 } fill="outline" caption="Custom tooltip" onClick={ () => null } />
             </Tooltip>
         </FlexRow>

diff --git a/app/src/docs/_examples/tooltip/CustomMarkupExample.module.scss b/app/src/docs/_examples/tooltip/CustomMarkupExample.module.scss
@@ -1,5 +1,10 @@
+.header {
+    padding-top: 6px;
+}
+
 .textBlock:not(:last-child) {
-    border-right: 1px solid var(--uui-neutral-5);
+    padding-right: 6px;
+    border-right: 1px solid var(--uui-divider);
 }
 
 .text {

diff --git a/uui-build/rollup/rollup.config.js b/uui-build/rollup/rollup.config.js
@@ -6,7 +6,7 @@ const nodeResolve = require('@rollup/plugin-node-resolve');
 const replace = require('@rollup/plugin-replace');
 const { visualizer } = require('rollup-plugin-visualizer');
 
-const postCssDynamicImport = import('rollup-plugin-postcss');
+const postCssDynamicImport = import('rollup-plugin-postcss-modules');
 //
 const { getExternalDeps } = require('./utils/moduleExtDependenciesUtils');
 const { getTsConfigFile } = require('./utils/moduleTsConfigUtils');

diff --git a/yarn.lock b/yarn.lock
@@ -5782,6 +5782,11 @@ camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+"camelcase@^6.0.0 || ^7.0.0":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048"
+  integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==
+
 camelcase@^6.2.0, camelcase@^6.2.1, camelcase@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
@@ -13979,6 +13984,20 @@ postcss-modules@^4.0.0:
     postcss-modules-values "^4.0.0"
     string-hash "^1.1.1"
 
+postcss-modules@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-6.0.0.tgz#cac283dbabbbdc2558c45391cbd0e2df9ec50118"
+  integrity sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==
+  dependencies:
+    generic-names "^4.0.0"
+    icss-utils "^5.1.0"
+    lodash.camelcase "^4.3.0"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
+    string-hash "^1.1.1"
+
 postcss-nested@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
@@ -15236,6 +15255,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+reserved-words@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
+  integrity sha512-0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==
+
 resize-observer-polyfill@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"