@hsu-react/ui 0.0.8 → 0.0.10

package/lib/components/Panel/ListPanel/index.module.scss

@@ -87,7 +87,7 @@
 
     width: 100%;
     min-height: 0px;
-    padding: 14px 16px;
+    padding: 10px;
 
     background: var(--cf-surface);
 
@@ -102,23 +102,22 @@
     align-items: center;
     justify-content: space-between;
     column-gap: 10px;
+  }
 
-    padding: 10px;
+  // 页面级页签：无底色容器，页签拆成独立圆角块、块间留空；
+  // margin/radius 需 !important 压过 TabBar 内部的连体分段样式（负 margin + 首尾切角）
+  .headerTabBar {
+    column-gap: 4px;
 
-    background: var(--cf-subtle);
+    > div {
+      margin-left: 0 !important;
+      border-radius: 6px !important;
 
-    border-radius: 8px 8px 0px 0px;
-    border: 1px solid var(--cf-border);
+      background: var(--cf-surface);
+    }
   }
 
   &.hasHeaderTabBar {
-    .search {
-      padding: 10px;
-      margin-top: -10px;
-
-      border-radius: 0px 0px 8px 8px;
-    }
-
     &:not(:has(.search)) {
       .headerTabBarContainer {
         border-radius: 8px;

package/lib/components/Search/{_components → SearchAdvanced/_components}/AdvancedFiltersDrawer/index.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 import type { FormInstance } from "antd";
-import { FormItemProps } from "../../../FormItem";
-import { DrawerFormProps } from "../../../Form/DrawerForm";
-import type useLabelWidth from "../../../../hooks/useLabelWidth";
+import { FormItemProps } from "../../../../FormItem";
+import { DrawerFormProps } from "../../../../Form/DrawerForm";
+import type useLabelWidth from "../../../../../hooks/useLabelWidth";
 interface AdvancedFiltersDrawerProps {
     expand: boolean;
     setExpand: (expand: boolean) => void;

package/lib/components/Search/{_components → SearchAdvanced/_components}/AdvancedFiltersDrawer/index.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AdvancedFiltersDrawer = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _Form = _interopRequireDefault(require("../../../Form"));
+var _Form = _interopRequireDefault(require("../../../../Form"));
 var _icons = require("@ant-design/icons");
-var _Icon = _interopRequireDefault(require("../../../Icon"));
-var _indexModule = _interopRequireDefault(require("../../index.module.scss"));
+var _Icon = _interopRequireDefault(require("../../../../Icon"));
+var _indexModule = _interopRequireDefault(require("../../../index.module.scss"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const AdvancedFiltersDrawer = ({

package/lib/components/Search/SearchAdvanced/index.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
+var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
-var _AdvancedFiltersDrawer = require("../_components/AdvancedFiltersDrawer");
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
+var _AdvancedFiltersDrawer = require("./_components/AdvancedFiltersDrawer");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * 高级筛选模式的 Search 组件
  * - 不显示标签（label）
@@ -27,136 +19,29 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 const SearchAdvanced = props => {
   const {
-    searchItems = [],
-    moreSearchItems = [],
     className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
     advancedFiltersProps,
     setFilter,
     minLabelWidth,
-    defaultExpanded = false,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    showAllSearchItems = false,
-    searchText,
-    resetText,
-    onFilterChange,
-    columnOffsetWidth = 0
+    ...rest
   } = props;
-  const [form] = _antd.Form.useForm(externalForm);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    setExpand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted
-  } = (0, _hooks.useSearchCommon)({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems,
-    minLabelWidth,
-    baseWidth,
-    onSearch,
-    onReset,
-    columnOffsetWidth
-  });
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      ref: containerRef,
-      className: (0, _classnames.default)(_indexModule.default.Search, className, {
-        [_indexModule.default.advancedFilters]: true
-      }),
-      style: {
-        "--column-number": totalColumnNum,
-        "--column-offset-width": `${columnOffsetWidth}px`
-      },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: (0, _classnames.default)(_indexModule.default.searchOption, _indexModule.default[expand.toString()]),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, {
-          form: form,
-          className: (0, _classnames.default)(_indexModule.default.option, cls),
-          onValuesChange: onValuesChange,
-          children: [permitted && currentSearchItems?.map(item => {
-            return /*#__PURE__*/(0, _react.createElement)(_FormItem.default, {
-              ...item,
-              key: item.name,
-              className: (0, _classnames.default)(_indexModule.default.item, item.className, {
-                [_indexModule.default.unFill]: item.width !== undefined
-              }),
-              label: undefined,
-              labelWidth: undefined
-            });
-          }), (beforeButtonGroup?.length || affterButtonGroup?.length || permitted) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.ButtonGroup, {
-            beforeButtonGroup: beforeButtonGroup,
-            affterButtonGroup: affterButtonGroup,
-            expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
-              expand: expand,
-              toggleExpand: toggleExpand,
-              advancedFilters: true,
-              showExpandButton: showExpandButton,
-              showAllSearchItems: showAllSearchItems || !!moreSearchItems?.length
-            }),
-            permitted: permitted,
-            ref: buttonGroupRef,
-            children: [currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
-              onSearch: onSearchClick,
-              onReset: onResetClick,
-              searchDisabled: searchDisabled,
-              searchText: searchText,
-              resetText: resetText
-            }), setFilter && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-              searchItems: processedSearchItems,
-              originalSearchItems: searchItems,
-              setSearchItems: setSearchItems,
-              onFilterChange: onFilterChange
-            })]
-          })]
-        })
-      })
-    }), permitted && setExpand && /*#__PURE__*/(0, _jsxRuntime.jsx)(_AdvancedFiltersDrawer.AdvancedFiltersDrawer, {
-      expand: expand,
-      setExpand: setExpand,
-      searchItems: processedSearchItems,
-      form: form,
-      getLabelWidth: getLabelWidth,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...rest,
+    minLabelWidth: minLabelWidth,
+    advancedFilters: true,
+    showFilter: !!setFilter,
+    className: (0, _classnames.default)(className, _indexModule.default.advancedFilters),
+    renderOutside: ctx => ctx.setExpand && /*#__PURE__*/(0, _jsxRuntime.jsx)(_AdvancedFiltersDrawer.AdvancedFiltersDrawer, {
+      expand: ctx.expand,
+      setExpand: ctx.setExpand,
+      searchItems: ctx.processedSearchItems,
+      form: ctx.form,
+      getLabelWidth: ctx.getLabelWidth,
       minLabelWidth: minLabelWidth,
-      onSearchClick: onSearchClick,
-      onResetClick: onResetClick,
+      onSearchClick: ctx.onSearchClick,
+      onResetClick: ctx.onResetClick,
       advancedFiltersProps: advancedFiltersProps
-    })]
+    })
   });
 };
 var _default = exports.default = SearchAdvanced;

package/lib/components/Search/SearchCard/index.js

@@ -71,7 +71,7 @@ const SearchCard = /*#__PURE__*/(0, _react.memo)(props => {
     }),
     style: {
       "--searchCard-column-gap": `${gap}px`,
-      " --searchCard-padding-left-right": `${padding}px`
+      "--searchCard-padding-left-right": `${padding}px`
     },
     children: [showSearchBox && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBox.SearchBox, {
       value: internalValue,

package/lib/components/Search/{_components → SearchCollapsible/_components}/CollapseToggle/index.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CollapseToggle = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _Icon = _interopRequireDefault(require("../../../Icon"));
+var _Icon = _interopRequireDefault(require("../../../../Icon"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _indexModule = _interopRequireDefault(require("../../index.module.scss"));
+var _indexModule = _interopRequireDefault(require("../../../index.module.scss"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const CollapseToggle = ({

package/lib/components/Search/SearchCollapsible/index.js

@@ -5,16 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
-var _CollapseToggle = require("../_components/CollapseToggle");
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
+var _CollapseToggle = require("./_components/CollapseToggle");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -27,70 +21,15 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 const SearchCollapsible = props => {
   const {
-    searchItems = [],
-    moreSearchItems = [],
     className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
-    setFilter,
-    minLabelWidth,
     defaultExpanded = false,
     onCollapseToggle,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    showAllSearchItems = false,
-    searchText,
-    resetText,
-    onFilterChange,
-    columnOffsetWidth = 0
+    setFilter,
+    ...rest
   } = props;
-  const [form] = _antd.Form.useForm(externalForm);
+
   // collapse 的语义是反的，所以需要取反 defaultExpanded
   const [collapse, setCollapse] = (0, _react.useState)(!defaultExpanded);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted
-  } = (0, _hooks.useSearchCommon)({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems,
-    minLabelWidth,
-    baseWidth,
-    onSearch,
-    onReset,
-    columnOffsetWidth
-  });
 
   // 处理折叠切换
   const handleCollapseToggle = (0, _react.useCallback)(() => {
@@ -100,68 +39,17 @@ const SearchCollapsible = props => {
       return newCollapse;
     });
   }, [onCollapseToggle]);
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    ref: containerRef,
-    className: (0, _classnames.default)(_indexModule.default.Search, className, {
-      [_indexModule.default.collapseExpand]: true,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...rest,
+    defaultExpanded: defaultExpanded,
+    showFilter: !!setFilter,
+    className: (0, _classnames.default)(className, _indexModule.default.collapseExpand, {
       [_indexModule.default.collapse]: collapse
     }),
-    style: {
-      "--column-number": totalColumnNum,
-      "--column-offset-width": `${columnOffsetWidth}px`
-    },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames.default)(_indexModule.default.searchOption, _indexModule.default[expand.toString()]),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, {
-        form: form,
-        className: (0, _classnames.default)(_indexModule.default.option, cls),
-        onValuesChange: onValuesChange,
-        children: [permitted && currentSearchItems?.map((item, idx) => {
-          // 计算同一列的项（用于计算标签宽度）
-          const visibleCurrentItems = currentSearchItems.filter(i => i.visible !== false);
-          const columnIndex = idx % totalColumnNum;
-          const sameColumnItems = visibleCurrentItems.filter((_, _idx) => _idx % totalColumnNum === columnIndex);
-          return /*#__PURE__*/(0, _react.createElement)(_FormItem.default, {
-            ...item,
-            key: item.name,
-            className: (0, _classnames.default)(_indexModule.default.item, item.className, {
-              [_indexModule.default.unFill]: item.width !== undefined
-            }),
-            labelWidth: item.width !== undefined ? undefined : getLabelWidth(sameColumnItems, undefined, minLabelWidth)
-          });
-        }), (beforeButtonGroup?.length || affterButtonGroup?.length || permitted) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.ButtonGroup, {
-          beforeButtonGroup: beforeButtonGroup,
-          affterButtonGroup: affterButtonGroup,
-          expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
-            expand: expand,
-            toggleExpand: toggleExpand,
-            advancedFilters: false,
-            showExpandButton: showExpandButton,
-            showAllSearchItems: showAllSearchItems || !!moreSearchItems?.length
-          }),
-          permitted: permitted,
-          ref: buttonGroupRef,
-          children: [currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
-            onSearch: onSearchClick,
-            onReset: onResetClick,
-            searchDisabled: searchDisabled,
-            searchText: searchText,
-            resetText: resetText
-          }), setFilter && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    }), permitted && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CollapseToggle.CollapseToggle, {
+    afterForm: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CollapseToggle.CollapseToggle, {
       collapse: collapse,
       onToggle: handleCollapseToggle
-    })]
+    })
   });
 };
 var _default = exports.default = SearchCollapsible;

package/lib/components/Search/SearchWithFilter/index.js

@@ -4,20 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
+var _react = _interopRequireDefault(require("react"));
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * 带筛选器设置的 Search 组件
  * - 提供下拉菜单，允许用户动态选择显示哪些搜索项
@@ -25,123 +15,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * - 提供更灵活的搜索体验
  */
 const SearchWithFilter = props => {
-  const {
-    searchItems = [],
-    moreSearchItems = [],
-    className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
-    minLabelWidth,
-    defaultExpanded = false,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    showAllSearchItems = false,
-    searchText,
-    resetText,
-    onFilterChange,
-    columnOffsetWidth = 0
-  } = props;
-  const [form] = _antd.Form.useForm(externalForm);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted
-  } = (0, _hooks.useSearchCommon)({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems,
-    minLabelWidth,
-    baseWidth,
-    onSearch,
-    onReset,
-    columnOffsetWidth
-  });
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    ref: containerRef,
-    className: (0, _classnames.default)(_indexModule.default.Search, className),
-    style: {
-      "--column-number": totalColumnNum,
-      "--column-offset-width": `${columnOffsetWidth}px`
-    },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames.default)(_indexModule.default.searchOption, _indexModule.default[expand.toString()]),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, {
-        form: form,
-        className: (0, _classnames.default)(_indexModule.default.option, cls),
-        onValuesChange: onValuesChange,
-        children: [permitted && currentSearchItems?.map((item, idx) => {
-          // 计算同一列的项（用于计算标签宽度）
-          const visibleCurrentItems = currentSearchItems.filter(i => i.visible !== false);
-          const columnIndex = idx % totalColumnNum;
-          const sameColumnItems = visibleCurrentItems.filter((_, _idx) => _idx % totalColumnNum === columnIndex);
-          return /*#__PURE__*/(0, _react.createElement)(_FormItem.default, {
-            ...item,
-            key: item.name,
-            className: (0, _classnames.default)(_indexModule.default.item, item.className, {
-              [_indexModule.default.unFill]: item.width !== undefined
-            }),
-            labelWidth: item.width !== undefined ? undefined : getLabelWidth(sameColumnItems, undefined, minLabelWidth)
-          });
-        }), (beforeButtonGroup?.length || affterButtonGroup?.length || permitted) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.ButtonGroup, {
-          beforeButtonGroup: beforeButtonGroup,
-          affterButtonGroup: affterButtonGroup,
-          expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
-            expand: expand,
-            toggleExpand: toggleExpand,
-            advancedFilters: false,
-            showExpandButton: showExpandButton,
-            showAllSearchItems: showAllSearchItems || !!moreSearchItems?.length
-          }),
-          permitted: permitted,
-          ref: buttonGroupRef,
-          children: [currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
-            onSearch: onSearchClick,
-            onReset: onResetClick,
-            searchDisabled: searchDisabled,
-            searchText: searchText,
-            resetText: resetText
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...props,
+    showFilter: true
   });
 };
 var _default = exports.default = SearchWithFilter;