Merge branch 'main' into develop

epam · Jan 30, 2025 · 03cbb30 · 03cbb30
2 parents 152ecd6 + c16befc
commit 03cbb30
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 79 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/app",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM Unified UI landing",
   "author": "EPAM",
   "license": "MIT",
@@ -17,19 +17,19 @@
   "dependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@elastic/apm-rum": "^5.14.0",
-    "@epam/assets": "5.12.1",
-    "@epam/draft-rte": "5.12.1",
-    "@epam/electric": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/draft-rte": "5.13.0",
+    "@epam/electric": "5.13.0",
     "@epam/internal": "0.0.2",
-    "@epam/loveship": "5.12.1",
-    "@epam/promo": "5.12.1",
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
-    "@epam/uui-db": "5.12.1",
-    "@epam/uui-docs": "5.12.1",
-    "@epam/uui-editor": "5.12.1",
-    "@epam/uui-timeline": "5.12.1",
+    "@epam/loveship": "5.13.0",
+    "@epam/promo": "5.13.0",
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
+    "@epam/uui-db": "5.13.0",
+    "@epam/uui-docs": "5.13.0",
+    "@epam/uui-editor": "5.13.0",
+    "@epam/uui-timeline": "5.13.0",
     "@tanstack/react-query": "^5.17.19",
     "@udecode/plate-common": "31.3.2",
     "amplitude-js": "8.9.1",

diff --git a/app/public/index.html b/app/public/index.html
@@ -27,11 +27,32 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/themes/prism-coy.min.css" integrity="sha384-v15aiNnyEfhnpemZzTVe9Bb5DHhuH7OsXGaj7SPVyQZazurou/CIJG49yqKm8lg2" crossorigin="anonymous">    <title>Unified UI</title>
     <% if (process.env.NODE_ENV === 'production') { %>
         <script src='https://menu.epam.com/scripts/menu.js?app=uui3' async></script>
     <% } %>
 
+    <% if (process.env.NODE_ENV === 'production') { %>
+    <!-- CookiePro Cookies Consent Notice start for uui.epam.com -->
+    <script type="text/javascript" src=https://cookie-cdn.cookiepro.com/consent/0194a705-dff9-7c5a-97ef-98eecb725050/OtAutoBlock.js ></script>
+    <script src=https://cookie-cdn.cookiepro.com/scripttemplates/otSDKStub.js  type="text/javascript" charset="UTF-8" data-domain-script="0194a705-dff9-7c5a-97ef-98eecb725050" ></script>
+    <script type="text/javascript">
+        function OptanonWrapper() { }
+    </script>
+    <!-- CookiePro Cookies Consent Notice end for uui.epam.com -->
+    <% } %>
+
+    <% if (process.env.NODE_ENV === 'development') { %>
+    <!-- CookiePro Cookies Consent Notice start for uui.epam.com development -->
+    <script type="text/javascript" src=https://cookie-cdn.cookiepro.com/consent/0194a705-dff9-7c5a-97ef-98eecb725050-test/OtAutoBlock.js ></script>
+    <script src=https://cookie-cdn.cookiepro.com/scripttemplates/otSDKStub.js  type="text/javascript" charset="UTF-8" data-domain-script="0194a705-dff9-7c5a-97ef-98eecb725050-test" ></script>
+    <script type="text/javascript">
+        function OptanonWrapper() { }
+    </script>
+    <!-- CookiePro Cookies Consent Notice end for uui.epam.com development -->
+    <% } %>
+
     <% if (process.env.NODE_ENV === 'production') { %>
     <!-- Google Tag Manager -->
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -41,7 +62,6 @@
     })(window,document,'script','dataLayer','GTM-K5QNBCKB');</script>
     <!-- End Google Tag Manager -->
     <% } %>
-
 </head>
 <body class="uui-theme-promo">
 

diff --git a/changelog.md b/changelog.md
@@ -1,24 +1,25 @@
-# 5.xx.xx - xx.xx.2024
+# 5.13.0 - 30.01.2025
 **What's New**
-* Update UUI packages JS target from ES6 to ES2021
-* `PickerInputBaseProps` interface was moved from @epam/uui-components to '@epam/uui-core' package
+* Update UUI packages JS target from `ES6` to `ES2021`
+* `PickerInputBaseProps` interface was moved from `@epam/uui-components` to `@epam/uui-core` package
 * [MainMenuAvatar]: added `RawProps` prop
-* [CountIndicator]: text size increased for prop 'size' 12px from 8px to 10px
 * [DropdownMenuBody]: added `maxHeight` prop
-* [FiltersPanel]: add 'minCharsToSearch' and 'renderFooter' props for picker filter configuration
+* [FiltersPanel]: added `minCharsToSearch` and `renderFooter` props for picker filter configuration
 
 
 **What's Fixed**
-* [PickerInput]: show 'N selected' instead of '+N' tag if maxItems=0
+* [useForm]: reset `serverValidationState` by valid form save action
+* [PickerInput]: show 'N selected' instead of '+N' tag if `maxItems=0`
+* [DropdownContainer]: autofocus first active element on dropdown open
 * [PickerInput/FiltersPickerInput]: always show picker footer if picker has some selection
-* [useForm]: reset serverValidationState by valid form save action
 * [DropdownMenuButton]: fixed cropping of icons located to the right of the text
 * [PresetsPanel]: added scroll to `More` dropdown
 * [NotificationCard]: changed size of actions from '36' to '30'
+* [CountIndicator]: text size increased from `8px` to `10px` for 12 size
 * [MainMenuButton]: removed unnecessary `role` and `aria-haspopup` attributes ([#2733](https://github.com/epam/UUI/pull/2733))
-* [MainMenuButton]: Add `aria-current` attribute with value `page` for active links ([#2734](https://github.com/epam/UUI/pull/2734))
+* [MainMenuButton]: added `aria-current` attribute with value `page` for active links ([#2734](https://github.com/epam/UUI/pull/2734))
 * [DataTableRow]: fixed `ref` prop
-* [PickerInput]: fixed toggler selected value styles in case of single mode, searchPosition !== input and minCharsToSearch > 0 and for case with readonly=true and searchPosition !== input.
+* [PickerInput]: fixed toggler selected value styles in case of single mode, `searchPosition !== input` and `minCharsToSearch > 0` and for case with `readonly=true` and `searchPosition !== input`
 
 
 # 5.12.1 - 17.12.2024

diff --git a/draft-rte/package.json b/draft-rte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/draft-rte",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "author": "EPAM",
   "license": "MIT",
   "main": "index.js",
@@ -11,10 +11,10 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.12.1",
-    "@epam/loveship": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/loveship": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "@types/draft-js": "0.10.23",
     "classnames": "^2.2.6",
     "draft-convert": "^2.1.2",

diff --git a/epam-assets/package.json b/epam-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/assets",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM Assets Library",
   "author": "EPAM",
   "license": "MIT",

diff --git a/epam-electric/package.json b/epam-electric/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/electric",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI components set branded with 'electric' style",
   "author": "EPAM",
   "license": "MIT",
@@ -12,9 +12,9 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1"
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0"
   },
   "devDependencies": {
     "mockdate": "^3.0.5"

diff --git a/epam-promo/package.json b/epam-promo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/promo",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI4 components set",
   "author": "EPAM",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.12.1",
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "@types/classnames": "2.2.6",
     "classnames": "2.2.6"
   },

diff --git a/extra/package.json b/extra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-extra",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI components set branded with 'loveship' style",
   "author": "EPAM",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "build": "ts-node ../uui-build/ts/scripts/buildUuiModule.ts"
   },
   "dependencies": {
-    "@epam/loveship": "5.12.1",
-    "@epam/promo": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/loveship": "5.13.0",
+    "@epam/promo": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "immutable": "3.8.2"
   },
   "peerDependencies": {

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.12.1",
+  "version": "5.13.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "exact": true

diff --git a/loveship/package.json b/loveship/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/loveship",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI components set branded with 'loveship' style",
   "author": "EPAM",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.12.1",
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "@types/classnames": "2.2.6",
     "classnames": "2.2.6"
   },

diff --git a/server/utils/cspUtil.js b/server/utils/cspUtil.js
@@ -31,15 +31,15 @@ function getCspHeaderValue(isDevServer) {
             "connect-src 'self'",
             isDevServer && CUSTOM_THEME_ASSETS.LOCAL,
             CUSTOM_THEME_ASSETS.CLOUDFLARE_PAGES,
-            'https://*.epam.com https://*.amplitude.com/ wss://menu.epam.com/ https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com',
+            'https://*.epam.com https://*.amplitude.com/ wss://menu.epam.com/ https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com https://cookie-cdn.cookiepro.com https://geolocation.onetrust.com/',
         ),
         'frame-src *; ',
         'img-src * data: ; ',
         dir(
             "script-src 'self'",
             "'unsafe-inline'",
             isDevServer && "'unsafe-eval'",
-            'https://*.epam.com https://www.googletagmanager.com/ https://www.google-analytics.com/ https://*.amplitude.com',
+            'https://*.epam.com https://www.googletagmanager.com/ https://www.google-analytics.com/ https://*.amplitude.com https://cookie-cdn.cookiepro.com',
         ),
     );
 }

diff --git a/templates/uui-cra-template/package.json b/templates/uui-cra-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/cra-template-uui",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "keywords": [
     "UUI",
     "react",

diff --git a/test-utils/package.json b/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-test-utils",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "author": "EPAM",
   "license": "MIT",
   "private": false,
@@ -11,7 +11,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-core": "5.12.1",
+    "@epam/uui-core": "5.13.0",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.4.3",
     "@types/react-test-renderer": "18.0.0",

diff --git a/uui-build/package.json b/uui-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-build",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "bin": {
     "epam-uui-build": "./bin/cli.js"
   },

diff --git a/uui-components/package.json b/uui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-components",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI Components",
   "author": "EPAM",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-core": "5.12.1",
+    "@epam/uui-core": "5.13.0",
     "@popperjs/core": "2.9.0",
     "@types/classnames": "2.2.6",
     "@types/react-measure": "2.0.8",

diff --git a/uui-components/src/overlays/DropdownContainer.tsx b/uui-components/src/overlays/DropdownContainer.tsx
@@ -101,7 +101,7 @@ export const DropdownContainer = React.forwardRef((props: DropdownContainerProps
                 persistentFocus={ persistentFocus }
                 lockProps={ { ...({ onKeyDown: handleEscape }), ...props.lockProps } }
                 shards={ props.shards }
-                autoFocus={ false }
+                autoFocus={ props.autoFocus || true }
                 as={ props.as }
             >
                 {renderDropdownContainer()}

diff --git a/uui-core/package.json b/uui-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-core",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI Core",
   "author": "EPAM",
   "license": "MIT",

diff --git a/uui-db/package.json b/uui-db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-db",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "UUI - client-side relational state cache",
   "author": "EPAM",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-core": "5.12.1",
+    "@epam/uui-core": "5.13.0",
     "@types/lodash.countby": "4.6.6",
     "@types/lodash.filter": "4.6.6",
     "@types/lodash.foreach": "4.5.6",

diff --git a/uui-docs/package.json b/uui-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-docs",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "EPAM UUI Documentation infrastructure",
   "author": "EPAM",
   "license": "MIT",
@@ -12,11 +12,11 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.12.1",
-    "@epam/promo": "5.12.1",
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/promo": "5.13.0",
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "@types/classnames": "2.2.6",
     "classnames": "^2.2.6"
   },

diff --git a/uui-e2e-tests/package.json b/uui-e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-e2e-tests",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "description": "",
   "author": "EPAM",
   "license": "MIT",

diff --git a/uui-editor/package.json b/uui-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-editor",
-  "version": "5.12.1",
+  "version": "5.13.0",
   "author": "EPAM",
   "license": "MIT",
   "main": "index.js",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "7.0.0",
-    "@epam/assets": "5.12.1",
-    "@epam/uui": "5.12.1",
-    "@epam/uui-components": "5.12.1",
-    "@epam/uui-core": "5.12.1",
+    "@epam/assets": "5.13.0",
+    "@epam/uui": "5.13.0",
+    "@epam/uui-components": "5.13.0",
+    "@epam/uui-core": "5.13.0",
     "@udecode/plate-autoformat": "31.0.0",
     "@udecode/plate-basic-marks": "31.0.0",
     "@udecode/plate-block-quote": "31.0.0",