iglooform 2.5.3 → 2.5.6

package/es/search-box/index.d.ts

@@ -1,31 +1,19 @@
+import { ButtonProps } from 'antd/lib/button';
 import { FC, IglooComponentProps } from '../types';
 import './style';
 import { ComponentProps } from '../utils/option-utils';
-declare const SearchBox: FC<import("../utils/option-utils").HOCProps & IglooComponentProps & {
-    className?: string | undefined;
+declare type IProps = IglooComponentProps & {
+    className?: string;
     onSearch?: any;
     value?: any;
-    multiple?: boolean | undefined;
-    modalTitle?: string | undefined;
-    placeHolder?: string | undefined;
-    modalPlaceHolder?: string | undefined;
-    optionsUpdating?: boolean | undefined;
+    multiple?: boolean;
+    modalTitle?: string;
+    placeHolder?: string;
+    modalPlaceHolder?: string;
+    optionsUpdating?: boolean;
     onChange?: any;
-    okButtonProps?: Partial<{
-        href: string;
-        target?: string | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & import("antd/lib/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<any>, "onClick" | "type"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<any>, "onClick" | "type">> | undefined;
-    cancelButtonProps?: Partial<{
-        href: string;
-        target?: string | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & import("antd/lib/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<any>, "onClick" | "type"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<any>, "onClick" | "type">> | undefined;
-} & ComponentProps>;
+    okButtonProps?: ButtonProps;
+    cancelButtonProps?: ButtonProps;
+} & ComponentProps;
+declare const SearchBox: FC<IProps>;
 export default SearchBox;

package/es/search-box/index.js

@@ -31,11 +31,11 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classnames from 'classnames';
 import { SearchOutlined, LoadingOutlined, ArrowLeftOutlined } from 'iglooicon';
-import Modal from '@/modal';
-import Input from '@/input';
-import CheckBox from '@/checkbox';
-import Typography from '@/typography';
-import Button from '@/button';
+import Modal from '../modal';
+import Input from '../input';
+import CheckBox from '../checkbox';
+import Typography from '../typography';
+import Button from '../button';
 import { LocaleContext } from '../locale';
 import { useState, useContext, useEffect, useMemo } from 'react';
 import './style';

package/es/utils/option-utils.js

@@ -108,6 +108,10 @@ export function optionsHOC(Component) {
     }, [optionsFromGetOptions]);
     invariant(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
     useEffect(function () {
+      if (Array.isArray(optionsFromGetOptions)) {
+        return;
+      }
+
       setUpdating(true);
 
       var calcOptions = /*#__PURE__*/function () {
@@ -222,7 +226,7 @@ export function optionsHOC(Component) {
 
         setUpdating(false);
       });
-    }, [options, optionGroups, dependFieldValue, searchKey]);
+    }, [options, optionsFromGetOptions, optionGroups, dependFieldValue, searchKey]);
     return _options ? _jsx(Component, _objectSpread(_objectSpread({
       options: _options
     }, rest), {}, {

package/lib/search-box/index.d.ts

@@ -1,31 +1,19 @@
+import { ButtonProps } from 'antd/lib/button';
 import { FC, IglooComponentProps } from '../types';
 import './style';
 import { ComponentProps } from '../utils/option-utils';
-declare const SearchBox: FC<import("../utils/option-utils").HOCProps & IglooComponentProps & {
-    className?: string | undefined;
+declare type IProps = IglooComponentProps & {
+    className?: string;
     onSearch?: any;
     value?: any;
-    multiple?: boolean | undefined;
-    modalTitle?: string | undefined;
-    placeHolder?: string | undefined;
-    modalPlaceHolder?: string | undefined;
-    optionsUpdating?: boolean | undefined;
+    multiple?: boolean;
+    modalTitle?: string;
+    placeHolder?: string;
+    modalPlaceHolder?: string;
+    optionsUpdating?: boolean;
     onChange?: any;
-    okButtonProps?: Partial<{
-        href: string;
-        target?: string | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & import("antd/lib/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<any>, "onClick" | "type"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<any>, "onClick" | "type">> | undefined;
-    cancelButtonProps?: Partial<{
-        href: string;
-        target?: string | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & import("antd/lib/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<any>, "onClick" | "type"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
-        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<any>, "onClick" | "type">> | undefined;
-} & ComponentProps>;
+    okButtonProps?: ButtonProps;
+    cancelButtonProps?: ButtonProps;
+} & ComponentProps;
+declare const SearchBox: FC<IProps>;
 export default SearchBox;

package/lib/search-box/index.js

@@ -15,15 +15,15 @@ var _classnames2 = _interopRequireDefault(require("classnames"));
 
 var _iglooicon = require("iglooicon");
 
-var _modal = _interopRequireDefault(require("@/modal"));
+var _modal = _interopRequireDefault(require("../modal"));
 
-var _input = _interopRequireDefault(require("@/input"));
+var _input = _interopRequireDefault(require("../input"));
 
-var _checkbox = _interopRequireDefault(require("@/checkbox"));
+var _checkbox = _interopRequireDefault(require("../checkbox"));
 
-var _typography = _interopRequireDefault(require("@/typography"));
+var _typography = _interopRequireDefault(require("../typography"));
 
-var _button = _interopRequireDefault(require("@/button"));
+var _button = _interopRequireDefault(require("../button"));
 
 var _locale = require("../locale");
 

package/lib/utils/option-utils.js

@@ -125,6 +125,10 @@ function optionsHOC(Component) {
     }, [optionsFromGetOptions]);
     (0, _invariant.default)(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
     (0, _react.useEffect)(function () {
+      if (Array.isArray(optionsFromGetOptions)) {
+        return;
+      }
+
       setUpdating(true);
 
       var calcOptions = /*#__PURE__*/function () {
@@ -239,7 +243,7 @@ function optionsHOC(Component) {
 
         setUpdating(false);
       });
-    }, [options, optionGroups, dependFieldValue, searchKey]);
+    }, [options, optionsFromGetOptions, optionGroups, dependFieldValue, searchKey]);
     return _options ? (0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({
       options: _options
     }, rest), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.3",
+  "version": "2.5.6",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",