Merge branch 'master' into data-tid

skbkontur · Jun 27, 2022 · 74e6fa3 · 74e6fa3
2 parents 4144ee1 + 7959af4
commit 74e6fa3
Show file tree

Hide file tree

Showing 101 changed files with 1,039 additions and 218 deletions.
diff --git a/.teamcity/patches/buildTypes/ReactUI_Publish.kts b/.teamcity/patches/buildTypes/ReactUI_Publish.kts
@@ -0,0 +1,24 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.SshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ReactUI_Publish'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ReactUI_Publish")) {
+    features {
+        val feature1 = find<SshAgent> {
+            sshAgent {
+                teamcitySshKey = "GitHub"
+            }
+        }
+        feature1.apply {
+            teamcitySshKey = "GitHub_ skbkontur-bot"
+        }
+    }
+}
diff --git a/.teamcity/patches/templates/ReactUI_GitHubFeatures.kts b/.teamcity/patches/templates/ReactUI_GitHubFeatures.kts
@@ -0,0 +1,40 @@
+package patches.templates
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the template with id = 'ReactUI_GitHubFeatures'
+accordingly, and delete the patch script.
+*/
+changeTemplate(RelativeId("ReactUI_GitHubFeatures")) {
+    features {
+        val feature1 = find<PullRequests> {
+            pullRequests {
+                id = "PULL_REQUESTS"
+                provider = github {
+                    serverUrl = ""
+                    authType = token {
+                        token = "credentialsJSON:7fd959b6-0b07-4bf1-87d0-1ce9c443528e"
+                    }
+                    filterSourceBranch = ""
+                    filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER_OR_COLLABORATOR
+                }
+            }
+        }
+        feature1.apply {
+            provider = github {
+                serverUrl = ""
+                authType = token {
+                    token = "credentialsJSON:7fd959b6-0b07-4bf1-87d0-1ce9c443528e"
+                }
+                filterSourceBranch = ""
+                filterTargetBranch = ""
+                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+            }
+        }
+    }
+}
diff --git a/packages/react-ui-smoke-test/CHANGELOG.md b/packages/react-ui-smoke-test/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.3](https://github.com/skbkontur/retail-ui/compare/[email protected]@2.0.3) (2022-06-15)
+
+**Note:** Version bump only for package react-ui-smoke-test
+
+
+
+
+
 ## [2.0.2](https://github.com/skbkontur/retail-ui/compare/[email protected]@2.0.2) (2022-04-25)
 
 **Note:** Version bump only for package react-ui-smoke-test

diff --git a/packages/react-ui-smoke-test/package.json b/packages/react-ui-smoke-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-ui-smoke-test",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "private": true,
   "scripts": {
     "pretest": "rimraf ./temp",

diff --git a/packages/react-ui-validations/CHANGELOG.md b/packages/react-ui-validations/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.4](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/[email protected]@1.8.4) (2022-06-15)
+
+**Note:** Version bump only for package react-ui-validations
+
+
+
+
+
 ## [1.8.3](https://github.com/skbkontur/retail-ui/tree/master/packages/react-ui-validations/compare/[email protected]@1.8.3) (2022-05-04)
 
 **Note:** Version bump only for package react-ui-validations

diff --git a/packages/react-ui-validations/package.json b/packages/react-ui-validations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-ui-validations",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Validations for @skbkontur/react-ui",
   "scripts": {
     "prebuild": "yarn clean",

diff --git a/...ges/Checkbox/checkbox label selection with pressed shift/plain/chrome/plain.png b/...ges/Checkbox/checkbox label selection with pressed shift/plain/chrome/plain.png
diff --git a/.../Checkbox/checkbox label selection with pressed shift/plain/chrome8px/plain.png b/.../Checkbox/checkbox label selection with pressed shift/plain/chrome8px/plain.png
diff --git a/...Checkbox/checkbox label selection with pressed shift/plain/chromeDark/plain.png b/...Checkbox/checkbox label selection with pressed shift/plain/chromeDark/plain.png
diff --git a/...ckbox/checkbox label selection with pressed shift/plain/chromeFlat8px/plain.png b/...ckbox/checkbox label selection with pressed shift/plain/chromeFlat8px/plain.png
diff --git a/...es/Checkbox/checkbox label selection with pressed shift/plain/firefox/plain.png b/...es/Checkbox/checkbox label selection with pressed shift/plain/firefox/plain.png
diff --git a/...Checkbox/checkbox label selection with pressed shift/plain/firefox8px/plain.png b/...Checkbox/checkbox label selection with pressed shift/plain/firefox8px/plain.png
diff --git a/...heckbox/checkbox label selection with pressed shift/plain/firefoxDark/plain.png b/...heckbox/checkbox label selection with pressed shift/plain/firefoxDark/plain.png
diff --git a/...kbox/checkbox label selection with pressed shift/plain/firefoxFlat8px/plain.png b/...kbox/checkbox label selection with pressed shift/plain/firefoxFlat8px/plain.png
diff --git a/...mages/Checkbox/checkbox label selection with pressed shift/plain/ie11/plain.png b/...mages/Checkbox/checkbox label selection with pressed shift/plain/ie11/plain.png
diff --git a/...es/Checkbox/checkbox label selection with pressed shift/plain/ie118px/plain.png b/...es/Checkbox/checkbox label selection with pressed shift/plain/ie118px/plain.png
diff --git a/...s/Checkbox/checkbox label selection with pressed shift/plain/ie11Dark/plain.png b/...s/Checkbox/checkbox label selection with pressed shift/plain/ie11Dark/plain.png
diff --git a/...heckbox/checkbox label selection with pressed shift/plain/ie11Flat8px/plain.png b/...heckbox/checkbox label selection with pressed shift/plain/ie11Flat8px/plain.png
diff --git a/...ressed shift/selected with pressed shift/chrome/selected with pressed shift.png b/...ressed shift/selected with pressed shift/chrome/selected with pressed shift.png
diff --git a/...sed shift/selected with pressed shift/chrome8px/selected with pressed shift.png b/...sed shift/selected with pressed shift/chrome8px/selected with pressed shift.png
diff --git a/...ed shift/selected with pressed shift/chromeDark/selected with pressed shift.png b/...ed shift/selected with pressed shift/chromeDark/selected with pressed shift.png
diff --git a/...shift/selected with pressed shift/chromeFlat8px/selected with pressed shift.png b/...shift/selected with pressed shift/chromeFlat8px/selected with pressed shift.png
diff --git a/...essed shift/selected with pressed shift/firefox/selected with pressed shift.png b/...essed shift/selected with pressed shift/firefox/selected with pressed shift.png
diff --git a/...ed shift/selected with pressed shift/firefox8px/selected with pressed shift.png b/...ed shift/selected with pressed shift/firefox8px/selected with pressed shift.png
diff --git a/...d shift/selected with pressed shift/firefoxDark/selected with pressed shift.png b/...d shift/selected with pressed shift/firefoxDark/selected with pressed shift.png
diff --git a/...hift/selected with pressed shift/firefoxFlat8px/selected with pressed shift.png b/...hift/selected with pressed shift/firefoxFlat8px/selected with pressed shift.png
diff --git a/... pressed shift/selected with pressed shift/ie11/selected with pressed shift.png b/... pressed shift/selected with pressed shift/ie11/selected with pressed shift.png
diff --git a/...essed shift/selected with pressed shift/ie118px/selected with pressed shift.png b/...essed shift/selected with pressed shift/ie118px/selected with pressed shift.png
diff --git a/...ssed shift/selected with pressed shift/ie11Dark/selected with pressed shift.png b/...ssed shift/selected with pressed shift/ie11Dark/selected with pressed shift.png
diff --git a/...d shift/selected with pressed shift/ie11Flat8px/selected with pressed shift.png b/...d shift/selected with pressed shift/ie11Flat8px/selected with pressed shift.png
diff --git a/...ui/.creevey/images/Dropdown/with custom select theme/clicked/chrome/clicked.png b/...ui/.creevey/images/Dropdown/with custom select theme/clicked/chrome/clicked.png
diff --git a/....creevey/images/Dropdown/with custom select theme/clicked/chrome8px/clicked.png b/....creevey/images/Dropdown/with custom select theme/clicked/chrome8px/clicked.png
diff --git a/...creevey/images/Dropdown/with custom select theme/clicked/chromeDark/clicked.png b/...creevey/images/Dropdown/with custom select theme/clicked/chromeDark/clicked.png
diff --git a/...i/.creevey/images/Dropdown/with custom select theme/clicked/firefox/clicked.png b/...i/.creevey/images/Dropdown/with custom select theme/clicked/firefox/clicked.png
diff --git a/...creevey/images/Dropdown/with custom select theme/clicked/firefox8px/clicked.png b/...creevey/images/Dropdown/with custom select theme/clicked/firefox8px/clicked.png
diff --git a/...reevey/images/Dropdown/with custom select theme/clicked/firefoxDark/clicked.png b/...reevey/images/Dropdown/with custom select theme/clicked/firefoxDark/clicked.png
diff --git a/...t-ui/.creevey/images/Dropdown/with custom select theme/clicked/ie11/clicked.png b/...t-ui/.creevey/images/Dropdown/with custom select theme/clicked/ie11/clicked.png
diff --git a/...i/.creevey/images/Dropdown/with custom select theme/clicked/ie118px/clicked.png b/...i/.creevey/images/Dropdown/with custom select theme/clicked/ie118px/clicked.png
diff --git a/.../.creevey/images/Dropdown/with custom select theme/clicked/ie11Dark/clicked.png b/.../.creevey/images/Dropdown/with custom select theme/clicked/ie11Dark/clicked.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chrome.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chrome.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chrome8px.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chrome8px.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chromeDark.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/chromeDark.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefox.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefox.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefox8px.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefox8px.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefoxDark.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/firefoxDark.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie11.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie11.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie118px.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie118px.png
diff --git a/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie11Dark.png b/packages/react-ui/.creevey/images/Tabs/With Custom Tab Component/ie11Dark.png
diff --git a/...creevey/images/TokenInput/custom render total count/renderTotalCount/chrome.png b/...creevey/images/TokenInput/custom render total count/renderTotalCount/chrome.png
diff --git a/...evey/images/TokenInput/custom render total count/renderTotalCount/chrome8px.png b/...evey/images/TokenInput/custom render total count/renderTotalCount/chrome8px.png
diff --git a/...vey/images/TokenInput/custom render total count/renderTotalCount/chromeDark.png b/...vey/images/TokenInput/custom render total count/renderTotalCount/chromeDark.png
diff --git a/.../images/TokenInput/custom render total count/renderTotalCount/chromeFlat8px.png b/.../images/TokenInput/custom render total count/renderTotalCount/chromeFlat8px.png
diff --git a/...reevey/images/TokenInput/custom render total count/renderTotalCount/firefox.png b/...reevey/images/TokenInput/custom render total count/renderTotalCount/firefox.png
diff --git a/...vey/images/TokenInput/custom render total count/renderTotalCount/firefox8px.png b/...vey/images/TokenInput/custom render total count/renderTotalCount/firefox8px.png
diff --git a/...ey/images/TokenInput/custom render total count/renderTotalCount/firefoxDark.png b/...ey/images/TokenInput/custom render total count/renderTotalCount/firefoxDark.png
diff --git a/...images/TokenInput/custom render total count/renderTotalCount/firefoxFlat8px.png b/...images/TokenInput/custom render total count/renderTotalCount/firefoxFlat8px.png
diff --git a/.../.creevey/images/TokenInput/custom render total count/renderTotalCount/ie11.png b/.../.creevey/images/TokenInput/custom render total count/renderTotalCount/ie11.png
diff --git a/...reevey/images/TokenInput/custom render total count/renderTotalCount/ie118px.png b/...reevey/images/TokenInput/custom render total count/renderTotalCount/ie118px.png
diff --git a/...eevey/images/TokenInput/custom render total count/renderTotalCount/ie11Dark.png b/...eevey/images/TokenInput/custom render total count/renderTotalCount/ie11Dark.png
diff --git a/...ey/images/TokenInput/custom render total count/renderTotalCount/ie11Flat8px.png b/...ey/images/TokenInput/custom render total count/renderTotalCount/ie11Flat8px.png
diff --git a/packages/react-ui/.eslintrc b/packages/react-ui/.eslintrc
@@ -1,11 +1,13 @@
 {
   "overrides": [
     {
-      "plugins": ["testing-library", "jest-dom"],
+      "plugins": ["testing-library", "jest-dom", "@emotion"],
       "extends": ["plugin:testing-library/dom", "plugin:jest-dom/recommended", "plugin:storybook/recommended"],
       "files": ["**/*.ts", "**/*.tsx"],
       "rules": {
-        "import/no-default-export": 0
+        "import/no-default-export": 0,
+        // This rule controls that we import configured emotion from lib/theming/Emotion and not the library itself
+        "@emotion/no-vanilla": 2
       }
     }
   ]

diff --git a/packages/react-ui/CHANGELOG.md b/packages/react-ui/CHANGELOG.md
@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.2](https://github.com/skbkontur/retail-ui/compare/@skbkontur/[email protected]...@skbkontur/[email protected]) (2022-06-27)
+
+
+### Bug Fixes
+
+* **Checkbox:** fix checking with pressed shift ([#2894](https://github.com/skbkontur/retail-ui/issues/2894)) ([2a3ee39](https://github.com/skbkontur/retail-ui/commit/2a3ee395bcc2844abdf992c9e594ea3ec2d0f593))
+* **dateinput:** don`t allow to enter incorrect dates from keyboard ([#2861](https://github.com/skbkontur/retail-ui/issues/2861)) ([d7bc564](https://github.com/skbkontur/retail-ui/commit/d7bc564789cd5a8353d01c5dbab58bfa06132fb2))
+* **PasswordInput:** focus input after clicking on the eye icon ([#2892](https://github.com/skbkontur/retail-ui/issues/2892)) ([350e0df](https://github.com/skbkontur/retail-ui/commit/350e0df18fabd4e42589b111f620bb4d4feee68d))
+* **Select:** button border-radius with custom select theme ([#2896](https://github.com/skbkontur/retail-ui/issues/2896)) ([a0fd12e](https://github.com/skbkontur/retail-ui/commit/a0fd12ed599b9deb8db42c2b3e053601a47a94fa))
+
+
+### Features
+
+* **tokeninput:** add renderTotalCount and totalCount props ([#2887](https://github.com/skbkontur/retail-ui/issues/2887)) ([e745f07](https://github.com/skbkontur/retail-ui/commit/e745f07f6524df4b1810aa1de304363f249d80c7))
+
+
+
+
+
+## [4.1.1](https://github.com/skbkontur/retail-ui/compare/@skbkontur/[email protected]...@skbkontur/[email protected]) (2022-06-15)
+
+
+### Bug Fixes
+
+* **MaskedInput:** accept null as value ([#2902](https://github.com/skbkontur/retail-ui/issues/2902)) ([e3414eb](https://github.com/skbkontur/retail-ui/commit/e3414ebfd3934995c415c68df44bb5afd9ecd8c2))
+* **rootNode:** enable findDOMNode fallback again ([1421484](https://github.com/skbkontur/retail-ui/commit/1421484076c389a16ae9d92199b0c2f60434e67f)), closes [#2873](https://github.com/skbkontur/retail-ui/issues/2873) [#2895](https://github.com/skbkontur/retail-ui/issues/2895)
+* **storybook:** StoryFn.story deprecated annotation ([#2798](https://github.com/skbkontur/retail-ui/issues/2798)) ([4c2bd8a](https://github.com/skbkontur/retail-ui/commit/4c2bd8ae93dc8e4a79f25de5baefe7a7c85b0b41))
+* **Tabs:** active tab underline ([839043d](https://github.com/skbkontur/retail-ui/commit/839043d5a78eda18ddba9610134fb4955a91dd43))
+* **TooltipMenu:** add onClose/onOpen props ([#2890](https://github.com/skbkontur/retail-ui/issues/2890)) ([92d4888](https://github.com/skbkontur/retail-ui/commit/92d48880c8feec11a00c8641c59e839a84e31fd2))
+
+
+
+
+
 # [4.1.0](https://github.com/skbkontur/retail-ui/compare/@skbkontur/[email protected]...@skbkontur/[email protected]) (2022-05-04)
 
 

diff --git a/packages/react-ui/components/Checkbox/Checkbox.styles.ts b/packages/react-ui/components/Checkbox/Checkbox.styles.ts
@@ -40,6 +40,12 @@ export const styles = memoizeStyle({
     `;
   },
 
+  rootDisableTextSelect() {
+    return css`
+      user-select: none;
+    `;
+  },
+
   rootChecked(t: Theme) {
     return css`
       &:hover .${globalClasses.box} {