Merge branch 'master' into fix/single-select-option-filter-issue

medly · Jul 5, 2023 · b49d8ab · b49d8ab
2 parents 3ee9839 + 9c564f0
commit b49d8ab
Show file tree

Hide file tree

Showing 9 changed files with 229 additions and 201 deletions.
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.27.1](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-07-01)
+
+
+### Bug Fixes
+
+* **core:** searchBox: clear/close icon not hiding when we manually clear the state value. ([#731](https://github.com/medly/medly-components/issues/731)) ([94a0227](https://github.com/medly/medly-components/commit/94a02279cb2cdd34face51ce0ebc0382b39025c0)), closes [#730](https://github.com/medly/medly-components/issues/730)
+
+
+
+
+
 # [6.27.0](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-06-16)
 
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@medly-components/core",
-    "version": "6.27.0",
+    "version": "6.27.1",
     "sideEffects": false,
     "main": "dist/cjs/index.js",
     "module": "dist/es/index.js",

diff --git a/packages/core/src/components/SearchBox/SearchBox.tsx b/packages/core/src/components/SearchBox/SearchBox.tsx
@@ -29,6 +29,7 @@ const Component: FC<SearchBoxProps> = memo(
             maxWidth,
             isLoading,
             loader: customLoader,
+            value,
             ...restProps
         } = props;
         const wrapperRef = useRef<any>(null),
@@ -39,7 +40,7 @@ const Component: FC<SearchBoxProps> = memo(
             [areOptionsVisible, setOptionsVisibilityState] = useState(false),
             [options, setOptions] = useState<Option[]>(defaultOptions || []),
             [isCustomSearchActive, setIsCustomSearchActive] = useState(false),
-            [showCloseIcon, setShowCloseIcon] = useState(!!restProps?.value?.toString().length),
+            [showCloseIcon, setShowCloseIcon] = useState(!!value?.toString().length),
             isEnterKeyPress = useKeyPress('Enter', true, optionsRef);
 
         useEffect(() => {
@@ -129,6 +130,10 @@ const Component: FC<SearchBoxProps> = memo(
             }
         }, [isEnterKeyPress]);
 
+        useEffect(() => {
+            setShowCloseIcon(!!value?.toString().length);
+        }, [value]);
+
         const hasCustomSearchFilter = !!customSearchFilter;
 
         return (
@@ -148,6 +153,7 @@ const Component: FC<SearchBoxProps> = memo(
                     ref={inputRef}
                     onFocus={handleFocus}
                     onBlur={handleBlur}
+                    value={value}
                     {...restProps}
                 />
                 {showCloseIcon && (

diff --git a/packages/core/src/components/SearchBox/__snapshots__/SearchBox.test.tsx.snap b/packages/core/src/components/SearchBox/__snapshots__/SearchBox.test.tsx.snap
@@ -374,6 +374,7 @@ exports[`SearchBox options should render options when user search option specifi
     <input
       class="c1"
       placeholder="search"
+      value=""
     />
     <span
       class="c2"
@@ -652,6 +653,7 @@ exports[`SearchBox should render properly with "M" size 1`] = `
     <input
       class="c1"
       placeholder="Search"
+      value=""
     />
     <span
       class="c2 c3"
@@ -887,6 +889,7 @@ exports[`SearchBox should render properly with "S" size 1`] = `
     <input
       class="c1"
       placeholder="Search"
+      value=""
     />
     <span
       class="c2 c3"

diff --git a/packages/forms/CHANGELOG.md b/packages/forms/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.2.12](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-07-01)
+
+**Note:** Version bump only for package @medly-components/forms
+
+
+
+
+
 ## [2.2.11](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-06-16)
 
 **Note:** Version bump only for package @medly-components/forms

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@medly-components/forms",
-    "version": "2.2.11",
+    "version": "2.2.12",
     "sideEffects": false,
     "main": "dist/cjs/index.js",
     "module": "dist/es/index.js",
@@ -29,7 +29,7 @@
         "styled-components": "^5.1.0"
     },
     "dependencies": {
-        "@medly-components/core": "6.27.0",
+        "@medly-components/core": "6.27.1",
         "@medly-components/theme": "5.2.1",
         "@medly-components/utils": "3.1.1",
         "date-fns": "^2.16.1",

diff --git a/packages/layout/CHANGELOG.md b/packages/layout/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.
 
+## [3.2.48](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-07-01)
+
+**Note:** Version bump only for package @medly-components/layout
+
+
+
+
+
 ## [3.2.47](https://github.com/medly/medly-components/compare/@medly-components/[email protected]...@medly-components/[email protected]) (2023-06-16)
 
 **Note:** Version bump only for package @medly-components/layout

diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@medly-components/layout",
-    "version": "3.2.47",
+    "version": "3.2.48",
     "sideEffects": false,
     "main": "dist/cjs/index.js",
     "module": "dist/es/index.js",
@@ -29,7 +29,7 @@
         "styled-components": "^5.1.0"
     },
     "dependencies": {
-        "@medly-components/core": "6.27.0",
+        "@medly-components/core": "6.27.1",
         "@medly-components/icons": "1.12.15",
         "@medly-components/theme": "5.2.1",
         "@medly-components/utils": "3.1.1"