@hi-ui/layout 5.0.0-canary.14 → 5.0.0-canary.16

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.
Files changed (5) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/lib/cjs/SearchTrigger.js +19 -6
  3. package/lib/esm/SearchTrigger.js +19 -6
  4. package/lib/types/SearchTrigger.d.ts +2 -10
  5. package/package.json +5 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @hi-ui/layout
2
2
 
3
+ ## 5.0.0-canary.16
4
+
5
+ ### Minor Changes
6
+
7
+ - fc69cd0d3: feat(search-trigger): 继承 MenuSearch 组件参数 (5.0)
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [916ad5c8a]
12
+ - @hi-ui/popover@5.0.0-canary.11
13
+
14
+ ## 5.0.0-canary.15
15
+
16
+ ### Patch Changes
17
+
18
+ - 305b4dd37: style: fix ui bug (5.0)
19
+ - Updated dependencies [c6c0159c4]
20
+ - Updated dependencies [305b4dd37]
21
+ - @hi-ui/icons@5.0.0-canary.9
22
+ - @hi-ui/menu@5.0.0-canary.17
23
+
3
24
  ## 5.0.0-canary.14
4
25
 
5
26
  ### Patch Changes
package/lib/cjs/SearchTrigger.js CHANGED
@@ -21,6 +21,8 @@ var core = require('@hi-ui/core');
21
21
  var icons = require('@hi-ui/icons');
22
22
  var Popper = require('@hi-ui/popper');
23
23
  var menu = require('@hi-ui/menu');
24
+ var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
25
+ var reactUtils = require('@hi-ui/react-utils');
24
26
  function _interopDefaultCompat(e) {
25
27
  return e && _typeof(e) === 'object' && 'default' in e ? e : {
26
28
  'default': e
@@ -41,16 +43,24 @@ var SearchTrigger = /*#__PURE__*/React.forwardRef(function (_a, ref) {
41
43
  className = _a.className,
42
44
  mini = _a.mini,
43
45
  placeholder = _a.placeholder,
46
+ _a$defaultValue = _a.defaultValue,
47
+ defaultValue = _a$defaultValue === void 0 ? '' : _a$defaultValue,
48
+ valueProp = _a.value,
49
+ onChange = _a.onChange,
44
50
  data = _a.data,
45
51
  onClick = _a.onClick,
46
- rest = tslib.__rest(_a, ["prefixCls", "role", "className", "mini", "placeholder", "data", "onClick"]);
52
+ _onSelect = _a.onSelect,
53
+ _onClear = _a.onClear,
54
+ _onClose = _a.onClose,
55
+ _onEsc = _a.onEsc,
56
+ rest = tslib.__rest(_a, ["prefixCls", "role", "className", "style", "mini", "placeholder", "defaultValue", "value", "onChange", "data", "onClick", "onSelect", "onClear", "onClose", "onEsc"]);
47
57
  var i18n = core.useLocaleContext();
48
58
  var _React$useState = React__default["default"].useState(false),
49
59
  visible = _React$useState[0],
50
60
  setVisible = _React$useState[1];
51
- var _React$useState2 = React__default["default"].useState(''),
52
- value = _React$useState2[0],
53
- setValue = _React$useState2[1];
61
+ var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultValue, valueProp, onChange),
62
+ value = _useUncontrolledState[0],
63
+ setValue = _useUncontrolledState[1];
54
64
  var innerRef = React__default["default"].useRef(null);
55
65
  var searchRef = React__default["default"].useRef(null);
56
66
  var cls = classname.cx(prefixCls, className, (_cx = {}, _cx[prefixCls + "--mini"] = mini, _cx));
@@ -62,7 +72,7 @@ var SearchTrigger = /*#__PURE__*/React.forwardRef(function (_a, ref) {
62
72
  setVisible(!visible);
63
73
  };
64
74
  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
65
- ref: innerRef,
75
+ ref: reactUtils.mergeRefs(innerRef, ref),
66
76
  role: role,
67
77
  className: cls,
68
78
  onClick: handleClick
@@ -98,17 +108,20 @@ var SearchTrigger = /*#__PURE__*/React.forwardRef(function (_a, ref) {
98
108
  data: data,
99
109
  placeholder: i18n.menuSearch.placeholder,
100
110
  onSelect: function onSelect(id, item) {
101
- console.log('select', id, item);
102
111
  setVisible(false);
112
+ _onSelect === null || _onSelect === void 0 ? void 0 : _onSelect(id, item);
103
113
  },
104
114
  onClear: function onClear() {
105
115
  setValue('');
116
+ _onClear === null || _onClear === void 0 ? void 0 : _onClear();
106
117
  },
107
118
  onClose: function onClose() {
108
119
  setVisible(false);
120
+ _onClose === null || _onClose === void 0 ? void 0 : _onClose();
109
121
  },
110
122
  onEsc: function onEsc() {
111
123
  setVisible(false);
124
+ _onEsc === null || _onEsc === void 0 ? void 0 : _onEsc();
112
125
  }
113
126
  })));
114
127
  });
package/lib/esm/SearchTrigger.js CHANGED
@@ -15,6 +15,8 @@ import { useLocaleContext } from '@hi-ui/core';
15
15
  import { SearchOutlined } from '@hi-ui/icons';
16
16
  import Popper from '@hi-ui/popper';
17
17
  import { MenuSearch } from '@hi-ui/menu';
18
+ import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
19
+ import { mergeRefs } from '@hi-ui/react-utils';
18
20
  var SEARCH_TRIGGER_PREFIX = getPrefixCls('search-trigger');
19
21
  /**
20
22
  * 搜索触发器组件
@@ -28,16 +30,24 @@ var SearchTrigger = /*#__PURE__*/forwardRef(function (_a, ref) {
28
30
  className = _a.className,
29
31
  mini = _a.mini,
30
32
  placeholder = _a.placeholder,
33
+ _a$defaultValue = _a.defaultValue,
34
+ defaultValue = _a$defaultValue === void 0 ? '' : _a$defaultValue,
35
+ valueProp = _a.value,
36
+ onChange = _a.onChange,
31
37
  data = _a.data,
32
38
  onClick = _a.onClick,
33
- rest = __rest(_a, ["prefixCls", "role", "className", "mini", "placeholder", "data", "onClick"]);
39
+ _onSelect = _a.onSelect,
40
+ _onClear = _a.onClear,
41
+ _onClose = _a.onClose,
42
+ _onEsc = _a.onEsc,
43
+ rest = __rest(_a, ["prefixCls", "role", "className", "style", "mini", "placeholder", "defaultValue", "value", "onChange", "data", "onClick", "onSelect", "onClear", "onClose", "onEsc"]);
34
44
  var i18n = useLocaleContext();
35
45
  var _React$useState = React.useState(false),
36
46
  visible = _React$useState[0],
37
47
  setVisible = _React$useState[1];
38
- var _React$useState2 = React.useState(''),
39
- value = _React$useState2[0],
40
- setValue = _React$useState2[1];
48
+ var _useUncontrolledState = useUncontrolledState(defaultValue, valueProp, onChange),
49
+ value = _useUncontrolledState[0],
50
+ setValue = _useUncontrolledState[1];
41
51
  var innerRef = React.useRef(null);
42
52
  var searchRef = React.useRef(null);
43
53
  var cls = cx(prefixCls, className, (_cx = {}, _cx[prefixCls + "--mini"] = mini, _cx));
@@ -49,7 +59,7 @@ var SearchTrigger = /*#__PURE__*/forwardRef(function (_a, ref) {
49
59
  setVisible(!visible);
50
60
  };
51
61
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", Object.assign({
52
- ref: innerRef,
62
+ ref: mergeRefs(innerRef, ref),
53
63
  role: role,
54
64
  className: cls,
55
65
  onClick: handleClick
@@ -85,17 +95,20 @@ var SearchTrigger = /*#__PURE__*/forwardRef(function (_a, ref) {
85
95
  data: data,
86
96
  placeholder: i18n.menuSearch.placeholder,
87
97
  onSelect: function onSelect(id, item) {
88
- console.log('select', id, item);
89
98
  setVisible(false);
99
+ _onSelect === null || _onSelect === void 0 ? void 0 : _onSelect(id, item);
90
100
  },
91
101
  onClear: function onClear() {
92
102
  setValue('');
103
+ _onClear === null || _onClear === void 0 ? void 0 : _onClear();
93
104
  },
94
105
  onClose: function onClose() {
95
106
  setVisible(false);
107
+ _onClose === null || _onClose === void 0 ? void 0 : _onClose();
96
108
  },
97
109
  onEsc: function onEsc() {
98
110
  setVisible(false);
111
+ _onEsc === null || _onEsc === void 0 ? void 0 : _onEsc();
99
112
  }
100
113
  })));
101
114
  });
package/lib/types/SearchTrigger.d.ts CHANGED
@@ -1,21 +1,13 @@
1
1
  import React from 'react';
2
2
  import { HiBaseHTMLProps } from '@hi-ui/core';
3
- import { MenuDataItem } from '@hi-ui/menu';
3
+ import { MenuSearchProps } from '@hi-ui/menu';
4
4
  /**
5
5
  * 搜索触发器组件
6
6
  */
7
7
  export declare const SearchTrigger: React.ForwardRefExoticComponent<SearchTriggerProps & React.RefAttributes<HTMLDivElement | null>>;
8
- export interface SearchTriggerProps extends HiBaseHTMLProps<'div'> {
8
+ export interface SearchTriggerProps extends HiBaseHTMLProps<'div'>, MenuSearchProps {
9
9
  /**
10
10
  * 迷你模式
11
11
  */
12
12
  mini?: boolean;
13
- /**
14
- * 占位符
15
- */
16
- placeholder?: string;
17
- /**
18
- * 菜单数据
19
- */
20
- data?: MenuDataItem[];
21
13
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hi-ui/layout",
3
- "version": "5.0.0-canary.14",
3
+ "version": "5.0.0-canary.16",
4
4
  "description": "A sub-package for @hi-ui/hiui.",
5
5
  "keywords": [],
6
6
  "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -46,10 +46,11 @@
46
46
  "dependencies": {
47
47
  "@hi-ui/classname": "^5.0.0-canary.2",
48
48
  "@hi-ui/env": "^5.0.0-canary.2",
49
- "@hi-ui/icons": "^5.0.0-canary.8",
50
- "@hi-ui/menu": "^5.0.0-canary.16",
49
+ "@hi-ui/icons": "^5.0.0-canary.9",
50
+ "@hi-ui/menu": "^5.0.0-canary.17",
51
51
  "@hi-ui/popper": "^5.0.0-canary.12",
52
- "@hi-ui/popover": "^5.0.0-canary.10",
52
+ "@hi-ui/popover": "^5.0.0-canary.11",
53
+ "@hi-ui/react-utils": "^5.0.0-canary.2",
53
54
  "@hi-ui/use-toggle": "^5.0.0-canary.2",
54
55
  "@hi-ui/use-uncontrolled-state": "^5.0.0-canary.2"
55
56
  },