rsuite 5.6.1 → 5.6.4
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/CHANGELOG.md +16 -0
- package/Sidenav/styles/index.less +2 -1
- package/cjs/@types/common.d.ts +4 -4
- package/cjs/Affix/Affix.js +0 -2
- package/cjs/Animation/Transition.d.ts +1 -1
- package/cjs/Animation/Transition.js +10 -4
- package/cjs/CheckTree/index.d.ts +2 -0
- package/cjs/CheckTreePicker/CheckTreePicker.js +12 -5
- package/cjs/CheckTreePicker/utils.js +1 -1
- package/cjs/List/helper/AutoScroller.d.ts +2 -3
- package/cjs/List/helper/useManager.d.ts +2 -2
- package/cjs/List/helper/useSortHelper.js +23 -9
- package/cjs/List/helper/utils.d.ts +4 -3
- package/cjs/List/helper/utils.js +2 -2
- package/cjs/MaskedInput/conformToMask.js +1 -0
- package/cjs/MultiCascader/DropdownMenu.js +2 -1
- package/cjs/MultiCascader/utils.js +7 -7
- package/cjs/Overlay/Position.js +1 -2
- package/cjs/Pagination/PaginationGroup.js +3 -3
- package/cjs/Picker/SelectedElement.js +1 -1
- package/cjs/TreePicker/TreePicker.js +1 -1
- package/cjs/Uploader/Uploader.js +5 -1
- package/cjs/utils/treeUtils.js +6 -4
- package/dist/rsuite-rtl.css +2 -1
- package/dist/rsuite-rtl.min.css +1 -1
- package/dist/rsuite-rtl.min.css.map +1 -1
- package/dist/rsuite.css +2 -1
- package/dist/rsuite.js +35 -354
- package/dist/rsuite.js.map +1 -1
- package/dist/rsuite.min.css +1 -1
- package/dist/rsuite.min.css.map +1 -1
- package/dist/rsuite.min.js +1 -1
- package/dist/rsuite.min.js.map +1 -1
- package/esm/@types/common.d.ts +4 -4
- package/esm/Affix/Affix.js +0 -2
- package/esm/Animation/Transition.d.ts +1 -1
- package/esm/Animation/Transition.js +10 -4
- package/esm/CheckTree/index.d.ts +2 -0
- package/esm/CheckTreePicker/CheckTreePicker.js +12 -5
- package/esm/CheckTreePicker/utils.js +1 -1
- package/esm/List/helper/AutoScroller.d.ts +2 -3
- package/esm/List/helper/useManager.d.ts +2 -2
- package/esm/List/helper/useSortHelper.js +23 -9
- package/esm/List/helper/utils.d.ts +4 -3
- package/esm/List/helper/utils.js +2 -2
- package/esm/MaskedInput/conformToMask.js +1 -0
- package/esm/MultiCascader/DropdownMenu.js +2 -1
- package/esm/MultiCascader/utils.js +7 -7
- package/esm/Overlay/Position.js +1 -2
- package/esm/Pagination/PaginationGroup.js +3 -3
- package/esm/Picker/SelectedElement.js +1 -1
- package/esm/TreePicker/TreePicker.js +1 -1
- package/esm/Uploader/Uploader.js +5 -1
- package/esm/utils/treeUtils.js +6 -4
- package/package.json +2 -2
package/esm/@types/common.d.ts
CHANGED
|
@@ -143,10 +143,10 @@ export interface ItemDataType<T = number | string> extends Record<string, any> {
|
|
|
143
143
|
loading?: boolean;
|
|
144
144
|
}
|
|
145
145
|
export interface Offset {
|
|
146
|
-
top
|
|
147
|
-
left
|
|
148
|
-
width
|
|
149
|
-
height
|
|
146
|
+
top: number;
|
|
147
|
+
left: number;
|
|
148
|
+
width: number;
|
|
149
|
+
height: number;
|
|
150
150
|
}
|
|
151
151
|
export declare type OnChangeCallback<T, E = React.SyntheticEvent> = (value: T, event: E) => void;
|
|
152
152
|
export {};
|
package/esm/Affix/Affix.js
CHANGED
|
@@ -14,7 +14,6 @@ function useOffset(mountRef) {
|
|
|
14
14
|
setOffset = _useState[1];
|
|
15
15
|
|
|
16
16
|
var updateOffset = useCallback(function () {
|
|
17
|
-
// FIXME upgrade dom-lib
|
|
18
17
|
setOffset(getOffset(mountRef.current));
|
|
19
18
|
}, [mountRef]); // Update after the element size changes
|
|
20
19
|
|
|
@@ -119,7 +118,6 @@ var Affix = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
119
118
|
var fixedStyles = {
|
|
120
119
|
position: 'fixed',
|
|
121
120
|
top: top,
|
|
122
|
-
left: offset === null || offset === void 0 ? void 0 : offset.left,
|
|
123
121
|
width: offset === null || offset === void 0 ? void 0 : offset.width,
|
|
124
122
|
zIndex: 10
|
|
125
123
|
};
|
|
@@ -100,7 +100,7 @@ declare class Transition extends React.Component<TransitionProps, TransitionStat
|
|
|
100
100
|
setNextCallback(callback: (event?: React.AnimationEvent) => void): {
|
|
101
101
|
(event?: React.AnimationEvent<Element> | undefined): void;
|
|
102
102
|
cancel: () => any;
|
|
103
|
-
};
|
|
103
|
+
} | null;
|
|
104
104
|
getChildElement(): HTMLElement;
|
|
105
105
|
performEnter(props: TransitionProps): void;
|
|
106
106
|
performExit(props: TransitionProps): void;
|
|
@@ -133,6 +133,10 @@ var Transition = /*#__PURE__*/function (_React$Component) {
|
|
|
133
133
|
this.setNextCallback(handler);
|
|
134
134
|
(_this$animationEventL = this.animationEventListener) === null || _this$animationEventL === void 0 ? void 0 : _this$animationEventL.off();
|
|
135
135
|
|
|
136
|
+
if (!this.nextCallback) {
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
|
|
136
140
|
if (node) {
|
|
137
141
|
var _this$props = this.props,
|
|
138
142
|
timeout = _this$props.timeout,
|
|
@@ -172,9 +176,11 @@ var Transition = /*#__PURE__*/function (_React$Component) {
|
|
|
172
176
|
_this2.nextCallback = null;
|
|
173
177
|
};
|
|
174
178
|
|
|
175
|
-
this.nextCallback
|
|
176
|
-
|
|
177
|
-
|
|
179
|
+
if (this.nextCallback) {
|
|
180
|
+
this.nextCallback.cancel = function () {
|
|
181
|
+
active = false;
|
|
182
|
+
};
|
|
183
|
+
}
|
|
178
184
|
|
|
179
185
|
return this.nextCallback;
|
|
180
186
|
};
|
|
@@ -252,7 +258,7 @@ var Transition = /*#__PURE__*/function (_React$Component) {
|
|
|
252
258
|
if (this.instanceElement) {
|
|
253
259
|
var nextCallback = this.setNextCallback(callback);
|
|
254
260
|
this.setState(nextState, function () {
|
|
255
|
-
return nextCallback();
|
|
261
|
+
return nextCallback === null || nextCallback === void 0 ? void 0 : nextCallback();
|
|
256
262
|
});
|
|
257
263
|
}
|
|
258
264
|
};
|
package/esm/CheckTree/index.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ import { TreeBaseProps } from '../Tree/Tree';
|
|
|
4
4
|
export interface CheckTreeProps extends TreeBaseProps<ValueType>, FormControlPickerProps<ValueType> {
|
|
5
5
|
/** Tree node cascade */
|
|
6
6
|
cascade?: boolean;
|
|
7
|
+
/** Set the option value for the check box not to be rendered */
|
|
8
|
+
uncheckableItemValues?: ValueType;
|
|
7
9
|
}
|
|
8
10
|
declare const CheckTree: RsRefForwardingComponent<'div', CheckTreeProps>;
|
|
9
11
|
export default CheckTree;
|
|
@@ -288,9 +288,9 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
288
288
|
forceUpdate();
|
|
289
289
|
}, [cascade, value, uncheckableItemValues, unSerializeList, flattenNodes, forceUpdate]);
|
|
290
290
|
var toggleUpChecked = useCallback(function (nodes, node, checked) {
|
|
291
|
-
var currentNode = nodes[node.refKey];
|
|
291
|
+
var currentNode = node.refKey ? nodes[node.refKey] : null;
|
|
292
292
|
|
|
293
|
-
if (cascade) {
|
|
293
|
+
if (cascade && currentNode) {
|
|
294
294
|
if (!checked) {
|
|
295
295
|
currentNode.check = checked;
|
|
296
296
|
currentNode.checkAll = checked;
|
|
@@ -310,7 +310,12 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
310
310
|
}
|
|
311
311
|
}, [cascade]);
|
|
312
312
|
var toggleDownChecked = useCallback(function (nodes, node, isChecked) {
|
|
313
|
-
var currentNode = nodes[node.refKey];
|
|
313
|
+
var currentNode = node.refKey ? nodes[node.refKey] : null;
|
|
314
|
+
|
|
315
|
+
if (!currentNode) {
|
|
316
|
+
return;
|
|
317
|
+
}
|
|
318
|
+
|
|
314
319
|
currentNode.check = isChecked;
|
|
315
320
|
|
|
316
321
|
if (!currentNode[childrenKey] || !currentNode[childrenKey].length || !cascade) {
|
|
@@ -334,11 +339,13 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
334
339
|
});
|
|
335
340
|
}, [flattenNodes, uncheckableItemValues, serializeListOnlyParent, toggleDownChecked, toggleUpChecked]);
|
|
336
341
|
var handleSelect = useCallback(function (node, event) {
|
|
337
|
-
|
|
342
|
+
var currentNode = node.refKey ? flattenNodes[node.refKey] : null;
|
|
343
|
+
|
|
344
|
+
if (!node || !currentNode) {
|
|
338
345
|
return;
|
|
339
346
|
}
|
|
340
347
|
|
|
341
|
-
var selectedValues = toggleChecked(node, !
|
|
348
|
+
var selectedValues = toggleChecked(node, !currentNode.check);
|
|
342
349
|
|
|
343
350
|
if (!isControlled) {
|
|
344
351
|
unSerializeList({
|
|
@@ -141,7 +141,7 @@ export function getDisabledState(nodes, node, props) {
|
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
return disabledItemValues.some(function (value) {
|
|
144
|
-
return shallowEqual(nodes[node.refKey][valueKey], value);
|
|
144
|
+
return node.refKey && shallowEqual(nodes[node.refKey][valueKey], value);
|
|
145
145
|
});
|
|
146
146
|
}
|
|
147
147
|
export function getCheckTreePickerDefaultValue(value, uncheckableItemValues) {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
declare type OffsetCallback = (offset: Offset) => void;
|
|
1
|
+
import { Axis, EdgeOffset } from './utils';
|
|
2
|
+
declare type OffsetCallback = (offset: EdgeOffset) => void;
|
|
4
3
|
export interface AutoScrollerUpdatePayload {
|
|
5
4
|
translate: Axis;
|
|
6
5
|
minTranslate: Axis;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { EdgeOffset } from './utils';
|
|
2
2
|
export declare type Collection = string | number;
|
|
3
3
|
export interface ManagedItem {
|
|
4
4
|
node: HTMLElement;
|
|
5
|
-
edgeOffset:
|
|
5
|
+
edgeOffset: Partial<EdgeOffset> | null;
|
|
6
6
|
info: {
|
|
7
7
|
collection: Collection;
|
|
8
8
|
index?: number;
|
|
@@ -112,11 +112,17 @@ var useSortHelper = function useSortHelper(config) {
|
|
|
112
112
|
x: offset.x - mouseDownEvent.pageX,
|
|
113
113
|
y: offset.y - mouseDownEvent.pageY
|
|
114
114
|
};
|
|
115
|
-
|
|
115
|
+
|
|
116
|
+
if (activeNodeHelper) {
|
|
117
|
+
setTranslate3d(activeNodeHelper, activeNodeHolderTranslate);
|
|
118
|
+
} // animate
|
|
119
|
+
|
|
116
120
|
|
|
117
121
|
activeNodeNextIndex = -1;
|
|
118
122
|
var listItemManagerRefs = getOrderedItems(curManagedItem.info.collection);
|
|
119
|
-
var
|
|
123
|
+
var aTop = activeNodeOffsetEdge.top || 0;
|
|
124
|
+
var cTop = containerScrollDelta.top || 0;
|
|
125
|
+
var sortingOffsetY = aTop + activeNodeHolderTranslate.y + cTop;
|
|
120
126
|
var activeNodeHeight = parseFloat(activeNodeStyle.height) || 0;
|
|
121
127
|
|
|
122
128
|
for (var i = 0, len = listItemManagerRefs.length; i < len; i++) {
|
|
@@ -149,14 +155,16 @@ var useSortHelper = function useSortHelper(config) {
|
|
|
149
155
|
continue;
|
|
150
156
|
}
|
|
151
157
|
|
|
152
|
-
|
|
158
|
+
var curEdgeOffsetTop = curEdgeOffset.top || 0;
|
|
159
|
+
|
|
160
|
+
if (prvNode && currentNodeIndex > activeNodeOldIndex && sortingOffsetY + offsetY >= curEdgeOffsetTop) {
|
|
153
161
|
translate.y = -activeNodeHeight;
|
|
154
162
|
animatedNodesOffset[currentNodeIndex] = {
|
|
155
163
|
x: 0,
|
|
156
164
|
y: currentNode.offsetHeight
|
|
157
165
|
};
|
|
158
166
|
activeNodeNextIndex = currentNodeIndex;
|
|
159
|
-
} else if (nextNode && currentNodeIndex < activeNodeOldIndex && sortingOffsetY <=
|
|
167
|
+
} else if (nextNode && currentNodeIndex < activeNodeOldIndex && sortingOffsetY <= curEdgeOffsetTop + offsetY) {
|
|
160
168
|
translate.y = activeNodeHeight;
|
|
161
169
|
animatedNodesOffset[currentNodeIndex] = {
|
|
162
170
|
x: 0,
|
|
@@ -190,9 +198,11 @@ var useSortHelper = function useSortHelper(config) {
|
|
|
190
198
|
height: activeNodeBoundingClientRect.height,
|
|
191
199
|
translate: activeNodeHolderTranslate,
|
|
192
200
|
maxTranslate: {
|
|
201
|
+
x: 0,
|
|
193
202
|
y: containerBoundingRect.top + containerBoundingRect.height - activeNodeBoundingClientRect.top - activeNodeBoundingClientRect.height / 2
|
|
194
203
|
},
|
|
195
204
|
minTranslate: {
|
|
205
|
+
x: 0,
|
|
196
206
|
y: containerBoundingRect.top - activeNodeBoundingClientRect.top - activeNodeBoundingClientRect.height / 2
|
|
197
207
|
}
|
|
198
208
|
});
|
|
@@ -213,11 +223,15 @@ var useSortHelper = function useSortHelper(config) {
|
|
|
213
223
|
sortMouseEndListener.off();
|
|
214
224
|
var holderTranslate = getHolderTranslate();
|
|
215
225
|
var containerScrollDelta = getContainerScrollDelta();
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
226
|
+
|
|
227
|
+
if (activeNodeHelper) {
|
|
228
|
+
setTranslate3d(activeNodeHelper, {
|
|
229
|
+
x: holderTranslate.x - (containerScrollDelta.left || 0),
|
|
230
|
+
y: holderTranslate.y - (containerScrollDelta.top || 0)
|
|
231
|
+
});
|
|
232
|
+
setTransitionDuration(activeNodeHelper, transitionDuration);
|
|
233
|
+
} // wait for animation
|
|
234
|
+
|
|
221
235
|
|
|
222
236
|
setTimeout(function () {
|
|
223
237
|
var _activeNodeHelper2, _activeNodeHelper2$pa;
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { CSSProperties } from 'react';
|
|
2
2
|
import { Offset } from '../../@types/common';
|
|
3
3
|
export interface Axis {
|
|
4
|
-
x
|
|
5
|
-
y
|
|
4
|
+
x: number;
|
|
5
|
+
y: number;
|
|
6
6
|
}
|
|
7
|
+
export declare type EdgeOffset = Omit<Offset, 'width' | 'height'>;
|
|
7
8
|
export declare function isContainInteractiveElement(targetNode: HTMLElement): boolean;
|
|
8
9
|
export declare function setInlineStyles(node: HTMLElement, styles: CSSProperties): void;
|
|
9
10
|
export declare function setTranslate3d(node: HTMLElement, translate: Axis | null): void;
|
|
@@ -12,5 +13,5 @@ export declare function setTransitionDuration(node: HTMLElement, duration?: numb
|
|
|
12
13
|
* find closest target node from source node
|
|
13
14
|
* */
|
|
14
15
|
export declare function closestNode(sourceNode: HTMLElement, judge: (target: HTMLElement) => boolean): HTMLElement | null;
|
|
15
|
-
export declare function getEdgeOffset(node: HTMLElement, parent: HTMLElement, offset?:
|
|
16
|
+
export declare function getEdgeOffset(node: HTMLElement, parent: HTMLElement, offset?: EdgeOffset): Partial<EdgeOffset>;
|
|
16
17
|
export declare function getScrollingParent(el: HTMLElement): HTMLElement | null;
|
package/esm/List/helper/utils.js
CHANGED
|
@@ -56,8 +56,8 @@ export function getEdgeOffset(node, parent, offset) {
|
|
|
56
56
|
|
|
57
57
|
|
|
58
58
|
var nodeOffset = {
|
|
59
|
-
left: offset.left + node.offsetLeft,
|
|
60
|
-
top: offset.top + node.offsetTop
|
|
59
|
+
left: (offset.left || 0) + node.offsetLeft,
|
|
60
|
+
top: (offset.top || 0) + node.offsetTop
|
|
61
61
|
};
|
|
62
62
|
|
|
63
63
|
if (node.parentNode === parent) {
|
|
@@ -123,6 +123,7 @@ export default function conformToMask(rawValue, mask, config) {
|
|
|
123
123
|
// or we find at least one character that we can map.
|
|
124
124
|
while (rawValueArr.length > 0) {
|
|
125
125
|
// Let's retrieve the first user character in the queue of characters we have left
|
|
126
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
126
127
|
var _ref = rawValueArr.shift(),
|
|
127
128
|
rawValueChar = _ref.char,
|
|
128
129
|
isNew = _ref.isNew; // If the character we got from the user input is a placeholder character (which happens
|
|
@@ -16,7 +16,8 @@ var emptyArray = [];
|
|
|
16
16
|
var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
17
17
|
var _props$as = props.as,
|
|
18
18
|
Component = _props$as === void 0 ? 'div' : _props$as,
|
|
19
|
-
classPrefix = props.classPrefix,
|
|
19
|
+
_props$classPrefix = props.classPrefix,
|
|
20
|
+
classPrefix = _props$classPrefix === void 0 ? 'menu' : _props$classPrefix,
|
|
20
21
|
className = props.className,
|
|
21
22
|
cascade = props.cascade,
|
|
22
23
|
_props$cascadeData = props.cascadeData,
|
|
@@ -265,21 +265,21 @@ export function useCascadeValue(props, flattenData) {
|
|
|
265
265
|
removedValue = removedValue.concat(removeAllChildrenValue(nextValue, item, {
|
|
266
266
|
valueKey: valueKey,
|
|
267
267
|
childrenKey: childrenKey
|
|
268
|
-
})); // Traverse all ancestor nodes of the current node
|
|
268
|
+
}) || []); // Traverse all ancestor nodes of the current node
|
|
269
269
|
// Then determine whether all the child nodes of these nodes are selected, and then they themselves must be selected
|
|
270
270
|
|
|
271
271
|
var _loop = function _loop(i) {
|
|
272
272
|
// Whether the parent node can be selected
|
|
273
|
-
var isCheckableParent = !uncheckableItemValues.some(function (v) {
|
|
273
|
+
var isCheckableParent = !(uncheckableItemValues !== null && uncheckableItemValues !== void 0 && uncheckableItemValues.some(function (v) {
|
|
274
274
|
return v === parents[i][valueKey];
|
|
275
|
-
});
|
|
275
|
+
}));
|
|
276
276
|
|
|
277
277
|
if (isCheckableParent) {
|
|
278
278
|
var isCheckAll = parents[i][childrenKey] // Filter out options that are marked as not selectable
|
|
279
279
|
.filter(function (n) {
|
|
280
|
-
return !uncheckableItemValues.some(function (v) {
|
|
280
|
+
return !(uncheckableItemValues !== null && uncheckableItemValues !== void 0 && uncheckableItemValues.some(function (v) {
|
|
281
281
|
return v === n[valueKey];
|
|
282
|
-
});
|
|
282
|
+
}));
|
|
283
283
|
}) // Check if all nodes are selected
|
|
284
284
|
.every(function (n) {
|
|
285
285
|
return nextValue.some(function (v) {
|
|
@@ -294,7 +294,7 @@ export function useCascadeValue(props, flattenData) {
|
|
|
294
294
|
removedValue = removedValue.concat(removeAllChildrenValue(nextValue, parents[i], {
|
|
295
295
|
valueKey: valueKey,
|
|
296
296
|
childrenKey: childrenKey
|
|
297
|
-
}));
|
|
297
|
+
}) || []);
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
300
|
};
|
|
@@ -377,7 +377,7 @@ export function useCascadeValue(props, flattenData) {
|
|
|
377
377
|
});
|
|
378
378
|
|
|
379
379
|
if (item !== null && item !== void 0 && item.parent && nextValue.some(function (v) {
|
|
380
|
-
return v === item.parent[valueKey];
|
|
380
|
+
return v === item.parent && item.parent[valueKey];
|
|
381
381
|
})) {
|
|
382
382
|
return false;
|
|
383
383
|
}
|
package/esm/Overlay/Position.js
CHANGED
|
@@ -69,8 +69,7 @@ var usePosition = function usePosition(props, ref) {
|
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
var overlay = getDOMNode(ref.current);
|
|
73
|
-
|
|
72
|
+
var overlay = getDOMNode(ref.current);
|
|
74
73
|
var containerElement = getContainer(typeof container === 'function' ? container() : container !== null && container !== void 0 ? container : null, ownerDocument(ref.current).body);
|
|
75
74
|
var posi = utils.calcOverlayPosition(overlay, targetElement, containerElement);
|
|
76
75
|
|
|
@@ -21,7 +21,7 @@ var LimitPicker = function LimitPicker(props) {
|
|
|
21
21
|
var formatlimitOptions = limitOptions.map(function (item) {
|
|
22
22
|
return {
|
|
23
23
|
value: item,
|
|
24
|
-
label: tplTransform(locale.limit, item)
|
|
24
|
+
label: locale.limit && tplTransform(locale.limit, item)
|
|
25
25
|
};
|
|
26
26
|
});
|
|
27
27
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -143,12 +143,12 @@ var PaginationGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
143
143
|
return /*#__PURE__*/React.createElement("div", {
|
|
144
144
|
key: onlyKey,
|
|
145
145
|
className: prefix('total')
|
|
146
|
-
}, tplTransform(locale.total, total));
|
|
146
|
+
}, locale.total && tplTransform(locale.total, total));
|
|
147
147
|
} else if (key === 'skip') {
|
|
148
148
|
return /*#__PURE__*/React.createElement("div", {
|
|
149
149
|
key: onlyKey,
|
|
150
150
|
className: classNames(prefix('skip'))
|
|
151
|
-
}, tplTransform(locale.skip, /*#__PURE__*/React.createElement(Input, {
|
|
151
|
+
}, locale.skip && tplTransform(locale.skip, /*#__PURE__*/React.createElement(Input, {
|
|
152
152
|
size: size,
|
|
153
153
|
onBlur: handleInputBlur,
|
|
154
154
|
onPressEnter: handleInputPressEnter
|
|
@@ -37,7 +37,7 @@ var SelectedElement = function SelectedElement(props) {
|
|
|
37
37
|
key: item[valueKey]
|
|
38
38
|
}, /*#__PURE__*/React.createElement("span", {
|
|
39
39
|
className: prefix('value-item')
|
|
40
|
-
}, item[labelKey], checkAll ? " (" + locale.checkAll + ")" : ''), index === count - 1 ? null : /*#__PURE__*/React.createElement("span", {
|
|
40
|
+
}, item[labelKey], checkAll && locale !== null && locale !== void 0 && locale.checkAll ? " (" + locale.checkAll + ")" : ''), index === count - 1 ? null : /*#__PURE__*/React.createElement("span", {
|
|
41
41
|
className: prefix('value-separator')
|
|
42
42
|
}, ","));
|
|
43
43
|
})), countable ? /*#__PURE__*/React.createElement("span", {
|
|
@@ -684,7 +684,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
684
684
|
var node = activeNode !== null && activeNode !== void 0 ? activeNode : {};
|
|
685
685
|
selectedElement = node[labelKey];
|
|
686
686
|
|
|
687
|
-
if (_isFunction(renderValue)) {
|
|
687
|
+
if (_isFunction(renderValue) && value) {
|
|
688
688
|
selectedElement = renderValue(value, node, selectedElement);
|
|
689
689
|
|
|
690
690
|
if (_isNil(selectedElement)) {
|
package/esm/Uploader/Uploader.js
CHANGED
|
@@ -267,7 +267,11 @@ var Uploader = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
267
267
|
updateFileStatus(_extends({}, file, {
|
|
268
268
|
status: 'uploading'
|
|
269
269
|
}));
|
|
270
|
-
|
|
270
|
+
|
|
271
|
+
if (file.fileKey) {
|
|
272
|
+
xhrs.current[file.fileKey] = xhr;
|
|
273
|
+
}
|
|
274
|
+
|
|
271
275
|
onUpload === null || onUpload === void 0 ? void 0 : onUpload(file, uploadData, xhr);
|
|
272
276
|
}, [action, data, handleAjaxUploadError, handleAjaxUploadProgress, handleAjaxUploadSuccess, headers, name, onUpload, timeout, updateFileStatus, withCredentials, disableMultipart]);
|
|
273
277
|
var handleAjaxUpload = useCallback(function () {
|
package/esm/utils/treeUtils.js
CHANGED
|
@@ -109,11 +109,13 @@ export function getNodeParentKeys(nodes, node, valueKey) {
|
|
|
109
109
|
var parentKeys = [];
|
|
110
110
|
|
|
111
111
|
var traverse = function traverse(node) {
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
var _node$parent;
|
|
113
|
+
|
|
114
|
+
if (node !== null && node !== void 0 && (_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.refKey) {
|
|
115
|
+
var _node$parent2;
|
|
114
116
|
|
|
115
117
|
traverse(nodes[node.parent.refKey]);
|
|
116
|
-
parentKeys.push(node === null || node === void 0 ? void 0 : (_node$
|
|
118
|
+
parentKeys.push(node === null || node === void 0 ? void 0 : (_node$parent2 = node.parent) === null || _node$parent2 === void 0 ? void 0 : _node$parent2[valueKey]);
|
|
117
119
|
}
|
|
118
120
|
};
|
|
119
121
|
|
|
@@ -629,7 +631,7 @@ export function getChildrenByFlattenNodes(nodes, parent) {
|
|
|
629
631
|
return Object.values(nodes).filter(function (item) {
|
|
630
632
|
var _item$parent;
|
|
631
633
|
|
|
632
|
-
return (item === null || item === void 0 ? void 0 : (_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent.refKey) === parent.refKey && !nodes[item.refKey].uncheckable;
|
|
634
|
+
return (item === null || item === void 0 ? void 0 : (_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent.refKey) === parent.refKey && item.refKey && !nodes[item.refKey].uncheckable;
|
|
633
635
|
});
|
|
634
636
|
}
|
|
635
637
|
export function useTreeDrag() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rsuite",
|
|
3
|
-
"version": "5.6.
|
|
3
|
+
"version": "5.6.4",
|
|
4
4
|
"description": "A suite of react components",
|
|
5
5
|
"main": "cjs/index.js",
|
|
6
6
|
"module": "esm/index.js",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"lodash": "^4.17.11",
|
|
38
38
|
"prop-types": "^15.7.2",
|
|
39
39
|
"react-virtualized": "^9.22.3",
|
|
40
|
-
"rsuite-table": "^5.3.
|
|
40
|
+
"rsuite-table": "^5.3.6",
|
|
41
41
|
"schema-typed": "^2.0.2"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|