Merge branch 'main' into develop

# Conflicts: # app/package.json # draft-rte/package.json # epam-assets/package.json # epam-electric/package.json # epam-promo/package.json # extra/package.json # lerna.json # loveship/package.json # templates/uui-cra-template/package.json # test-utils/package.json # uui-build/package.json # uui-components/package.json # uui-core/package.json # uui-db/package.json # uui-docs/package.json # uui-e2e-tests/package.json # uui-editor/package.json # uui-timeline/package.json # uui/package.json
epam · Oct 22, 2024 · be656d5 · be656d5
2 parents d9d920d + c3d5573
commit be656d5
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 70 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/app",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
-    "@epam/draft-rte": "5.11.0-alpha.0",
-    "@epam/electric": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/draft-rte": "5.10.2-alpha.0",
+    "@epam/electric": "5.10.2-alpha.0",
     "@epam/internal": "0.0.2",
-    "@epam/loveship": "5.11.0-alpha.0",
-    "@epam/promo": "5.11.0-alpha.0",
-    "@epam/uui": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
-    "@epam/uui-db": "5.11.0-alpha.0",
-    "@epam/uui-docs": "5.11.0-alpha.0",
-    "@epam/uui-editor": "5.11.0-alpha.0",
-    "@epam/uui-timeline": "5.11.0-alpha.0",
+    "@epam/loveship": "5.10.2-alpha.0",
+    "@epam/promo": "5.10.2-alpha.0",
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
+    "@epam/uui-db": "5.10.2-alpha.0",
+    "@epam/uui-docs": "5.10.2-alpha.0",
+    "@epam/uui-editor": "5.10.2-alpha.0",
+    "@epam/uui-timeline": "5.10.2-alpha.0",
     "@tanstack/react-query": "^5.17.19",
     "@udecode/plate-common": "31.3.2",
     "amplitude-js": "8.9.1",

diff --git a/draft-rte/package.json b/draft-rte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/draft-rte",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "author": "EPAM",
   "license": "MIT",
   "main": "index.js",
@@ -11,10 +11,10 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.11.0-alpha.0",
-    "@epam/loveship": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/loveship": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.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,12 +1,12 @@
 {
   "name": "@epam/assets",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "description": "EPAM Assets Library",
   "author": "EPAM",
   "license": "MIT",
   "scripts": {
     "build": "ts-node -T ../uui-build/ts/scripts/buildUuiModule.ts && yarn buildTheme",
-    "buildTheme": "yarn --cwd ../uui-build compile-theme-scss --dirs=./epam-assets/theme:./epam-assets/build/css/theme --recursive",
+    "buildTheme": "yarn --cwd ../uui-build compile-theme-scss --dirs=./epam-assets/theme:./epam-assets/build/css/theme",
     "prepublish": "yarn build"
   },
   "repository": {

diff --git a/epam-electric/package.json b/epam-electric/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/electric",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0"
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "description": "EPAM UUI4 components set",
   "author": "EPAM",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.11.0-alpha.0",
-    "@epam/uui": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
-    "@epam/promo": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/loveship": "5.10.2-alpha.0",
+    "@epam/promo": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "immutable": "3.8.2"
   },
   "peerDependencies": {

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
-    "@epam/uui": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "@types/classnames": "2.2.6",
     "classnames": "2.2.6"
   },

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.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "author": "EPAM",
   "license": "MIT",
   "private": false,
@@ -11,7 +11,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "@testing-library/react": "14.0.0",
     "@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,14 +1,14 @@
 {
   "name": "@epam/uui-build",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "bin": {
     "epam-uui-build": "./bin/cli.js"
   },
   "scripts": {
     "build": "yarn build-module",
     "build-module": "ts-node -T ts/scripts/buildUuiModule.ts",
     "generate-components-api": "ts-node ts/scripts/docsGen.ts",
-    "generate-theme-tokens": "ts-node ts/scripts/themeTokensGen.ts --tokens=../public/docs/figmaTokensGen/Theme.json --out-tokens=../public/docs/figmaTokensGen/ThemeOutput.json --out-tokens-data=../public/docs/figmaTokensGen/ThemeTokens.json --out=../epam-assets/theme/variables/tokens",
+    "generate-theme-tokens": "ts-node ts/scripts/themeTokensGen.ts --tokens=../public/docs/figmaTokensGen/Theme.json --out-tokens=../public/docs/figmaTokensGen/ThemeOutput.json --out-tokens-data=../public/docs/figmaTokensGen/ThemeTokens.json --out=../epam-assets/theme/tokens",
     "compile-theme-scss": "ts-node ts/scripts/compileThemeScss.ts",
     "track-bundle-size": "ts-node ts/scripts/trackBundleSize.ts",
     "prepublish": "yarn build",

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

diff --git a/uui-components/src/pickers/hooks/usePicker.ts b/uui-components/src/pickers/hooks/usePicker.ts
@@ -69,8 +69,23 @@ export function usePicker<TItem, TId, TProps extends PickerBaseProps<TItem, TId>
                     && dataSourceState.selectedId !== prevDataSourceState.selectedId)
             ))
         ) {
-            if (!isEqual(value, newValue)) {
-                handleSelectionValueChange(newValue);
+            // For entity mode we should check only ids because external entity can be different from ds entity
+            if (props.valueType === 'entity') {
+                if (props.selectionMode === 'single') {
+                    if (props.dataSource.getId(value as TItem) !== props.dataSource.getId(newValue as TItem)) {
+                        handleSelectionValueChange(newValue);
+                    }
+                } else {
+                    const newIds = (newValue as TItem[])?.map((i) =>props.dataSource.getId(i));
+                    const prevIds = (value as TItem[])?.map((i) =>props.dataSource.getId(i));
+                    if (!isEqual(newIds, prevIds)) {
+                        handleSelectionValueChange(newValue);
+                    }
+                }
+            } else {
+                if (!isEqual(value, newValue)) {
+                    handleSelectionValueChange(newValue);
+                }
             }
         }
 

diff --git a/uui-core/package.json b/uui-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-core",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "description": "UUI - client-side relational state cache",
   "author": "EPAM",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "description": "EPAM UUI Documentation infrastructure",
   "author": "EPAM",
   "license": "MIT",
@@ -12,11 +12,11 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.11.0-alpha.0",
-    "@epam/promo": "5.11.0-alpha.0",
-    "@epam/uui": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/promo": "5.10.2-alpha.0",
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.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.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "author": "EPAM",
   "license": "MIT",
   "main": "index.js",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "7.0.0",
-    "@epam/assets": "5.11.0-alpha.0",
-    "@epam/uui": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/uui": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "@udecode/plate-autoformat": "31.0.0",
     "@udecode/plate-basic-marks": "31.0.0",
     "@udecode/plate-block-quote": "31.0.0",

diff --git a/uui-timeline/package.json b/uui-timeline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui-timeline",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "author": "EPAM",
   "license": "MIT",
   "main": "index.js",
@@ -11,8 +11,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "@types/lodash.sortedindex": "^4.1.9",
     "classnames": "^2.2.6",
     "lodash.sortedindex": "^4.1.0"

diff --git a/uui/package.json b/uui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@epam/uui",
-  "version": "5.11.0-alpha.0",
+  "version": "5.10.2-alpha.0",
   "description": "EPAM UUI components set",
   "author": "EPAM",
   "license": "MIT",
@@ -12,9 +12,9 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@epam/assets": "5.11.0-alpha.0",
-    "@epam/uui-components": "5.11.0-alpha.0",
-    "@epam/uui-core": "5.11.0-alpha.0",
+    "@epam/assets": "5.10.2-alpha.0",
+    "@epam/uui-components": "5.10.2-alpha.0",
+    "@epam/uui-core": "5.10.2-alpha.0",
     "@popperjs/core": "2.9.0",
     "classnames": "2.2.6",
     "dayjs": "1.11.12",