next-helios-fe 1.10.0 → 1.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "next-helios-fe",
3
- "version": "1.10.0",
3
+ "version": "1.10.2",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -69,16 +69,22 @@ export const ModalSelect: React.FC<ModalSelectProps> = ({
69
69
  const [search, setSearch] = useState<string>("");
70
70
  const [delayedSearch, setDelayedSearch] = useState<string>("");
71
71
 
72
- useEffect(() => {
73
- console.log(selectedMenuHistory);
74
- }, [selectedMenuHistory]);
75
-
76
72
  useEffect(() => {
77
73
  if (value) {
78
74
  setTempValue(value);
79
75
  }
80
76
  }, [value]);
81
77
 
78
+ useEffect(() => {
79
+ if (dynamicSelect?.getValue) {
80
+ setSelectedMenuHistory(
81
+ data.menus.filter((menuItem: any) =>
82
+ (type === "select" ? [value] : value || []).includes(menuItem.value)
83
+ )
84
+ );
85
+ }
86
+ }, [data.menus]);
87
+
82
88
  useEffect(() => {
83
89
  if (!loading) {
84
90
  if (openModal) {
@@ -248,7 +254,11 @@ export const ModalSelect: React.FC<ModalSelectProps> = ({
248
254
  >
249
255
  {(dynamicSelect?.getValue
250
256
  ? delayedSearch
251
- ? data.menus
257
+ ? data.menus.filter((optionItem: any) =>
258
+ optionItem.label
259
+ .toLowerCase()
260
+ .includes(delayedSearch.toLowerCase())
261
+ )
252
262
  : [
253
263
  ...selectedMenuHistory,
254
264
  ...data.menus.filter(
@@ -259,9 +269,7 @@ export const ModalSelect: React.FC<ModalSelectProps> = ({
259
269
  ),
260
270
  ]
261
271
  : data.menus.filter((optionItem: any) =>
262
- optionItem.label
263
- .toLowerCase()
264
- .includes(search.toLocaleLowerCase())
272
+ optionItem.label.toLowerCase().includes(search.toLowerCase())
265
273
  )
266
274
  )?.length === 0 ? (
267
275
  <div className="flex-1 flex justify-center items-center">
@@ -270,7 +278,11 @@ export const ModalSelect: React.FC<ModalSelectProps> = ({
270
278
  ) : (
271
279
  (dynamicSelect?.getValue
272
280
  ? delayedSearch
273
- ? data.menus
281
+ ? data.menus.filter((optionItem: any) =>
282
+ optionItem.label
283
+ .toLowerCase()
284
+ .includes(delayedSearch.toLowerCase())
285
+ )
274
286
  : [
275
287
  ...selectedMenuHistory,
276
288
  ...data.menus.filter(
@@ -283,16 +295,27 @@ export const ModalSelect: React.FC<ModalSelectProps> = ({
283
295
  : data.menus.filter((optionItem: any) =>
284
296
  optionItem.label
285
297
  .toLowerCase()
286
- .includes(search.toLocaleLowerCase())
298
+ .includes(search.toLowerCase())
287
299
  )
288
300
  ).map((optionItem: any, index: number) => {
289
301
  return (
290
302
  <Button
291
303
  key={index}
292
304
  type="button"
293
- className="disabled:bg-primary-transparent"
305
+ className={`${
306
+ type === "select"
307
+ ? "disabled:bg-primary-transparent disabled:text-primary"
308
+ : "disabled:text-disabled"
309
+ }`}
294
310
  disabled={
295
311
  type === "select" && tempValue === optionItem.value
312
+ ? true
313
+ : type === "multipleSelect" &&
314
+ !tempValue?.includes(optionItem.value) &&
315
+ max &&
316
+ tempValue?.length === max
317
+ ? true
318
+ : false
296
319
  }
297
320
  onClick={() => {
298
321
  if (type === "select") {
@@ -179,12 +179,12 @@ export const MultipleSelect: React.FC<MultipleSelectProps> = ({
179
179
  value={tempValue.join(", ")}
180
180
  onChange={(e) => {}}
181
181
  onClick={(e) => {
182
- e.preventDefault();
183
- dropdownTriggerRef.current?.click();
184
- setDropdownWidth(
185
- inputRef?.current?.getBoundingClientRect()?.width || 0
186
- );
187
182
  if (!readOnly) {
183
+ e.preventDefault();
184
+ dropdownTriggerRef.current?.click();
185
+ setDropdownWidth(
186
+ inputRef?.current?.getBoundingClientRect()?.width || 0
187
+ );
188
188
  setOpenDropdown(true);
189
189
  }
190
190
  }}
@@ -116,12 +116,12 @@ export const Select: React.FC<SelectProps> = ({
116
116
  }
117
117
  onChange={(e) => {}}
118
118
  onClick={(e) => {
119
- e.preventDefault();
120
- dropdownTriggerRef.current?.click();
121
- setDropdownWidth(
122
- inputRef?.current?.getBoundingClientRect()?.width || 0
123
- );
124
119
  if (!readOnly) {
120
+ e.preventDefault();
121
+ dropdownTriggerRef.current?.click();
122
+ setDropdownWidth(
123
+ inputRef?.current?.getBoundingClientRect()?.width || 0
124
+ );
125
125
  setOpenDropdown(true);
126
126
  }
127
127
  }}