@primer/components 0.0.0-2021830164741 → 0.0.0-202183017829
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 +3 -1
- package/dist/browser.esm.js +250 -290
- package/dist/browser.esm.js.map +1 -1
- package/dist/browser.umd.js +318 -358
- package/dist/browser.umd.js.map +1 -1
- package/lib/AnchoredOverlay/AnchoredOverlay.d.ts +1 -2
- package/lib/AnchoredOverlay/AnchoredOverlay.js +3 -11
- package/lib/Dialog/ConfirmationDialog.js +3 -3
- package/lib/Dialog/Dialog.d.ts +5 -0
- package/lib/Dialog/Dialog.js +16 -4
- package/lib/FilteredActionList/FilteredActionList.js +31 -5
- package/lib/Overlay.d.ts +1 -2
- package/lib/Overlay.js +5 -10
- package/lib/SelectMenu/SelectMenu.d.ts +2 -8
- package/lib/TextInput.d.ts +3 -6
- package/lib/TextInput.js +10 -9
- package/lib/hooks/useOverlay.d.ts +1 -2
- package/lib/hooks/useOverlay.js +6 -11
- package/lib/index.d.ts +0 -2
- package/lib/index.js +0 -16
- package/lib/utils/types.d.ts +0 -3
- package/lib-esm/AnchoredOverlay/AnchoredOverlay.d.ts +1 -2
- package/lib-esm/AnchoredOverlay/AnchoredOverlay.js +3 -11
- package/lib-esm/Dialog/ConfirmationDialog.js +3 -3
- package/lib-esm/Dialog/Dialog.d.ts +5 -0
- package/lib-esm/Dialog/Dialog.js +17 -5
- package/lib-esm/FilteredActionList/FilteredActionList.js +31 -3
- package/lib-esm/Overlay.d.ts +1 -2
- package/lib-esm/Overlay.js +5 -8
- package/lib-esm/SelectMenu/SelectMenu.d.ts +2 -8
- package/lib-esm/TextInput.d.ts +3 -6
- package/lib-esm/TextInput.js +9 -8
- package/lib-esm/hooks/useOverlay.d.ts +1 -2
- package/lib-esm/hooks/useOverlay.js +6 -11
- package/lib-esm/index.d.ts +0 -2
- package/lib-esm/index.js +0 -2
- package/lib-esm/utils/types.d.ts +0 -3
- package/package.json +6 -9
- package/lib/Autocomplete/Autocomplete.d.ts +0 -31
- package/lib/Autocomplete/Autocomplete.js +0 -60
- package/lib/Autocomplete/AutocompleteContext.d.ts +0 -14
- package/lib/Autocomplete/AutocompleteContext.js +0 -11
- package/lib/Autocomplete/AutocompleteInput.d.ts +0 -9
- package/lib/Autocomplete/AutocompleteInput.js +0 -148
- package/lib/Autocomplete/AutocompleteMenu.d.ts +0 -78
- package/lib/Autocomplete/AutocompleteMenu.js +0 -257
- package/lib/Autocomplete/index.d.ts +0 -2
- package/lib/Autocomplete/index.js +0 -15
- package/lib/Badge/Badge.d.ts +0 -8
- package/lib/Badge/Badge.js +0 -59
- package/lib/Badge/BadgeState.d.ts +0 -13
- package/lib/Badge/BadgeState.js +0 -51
- package/lib/Badge/_badgeStyleUtils.d.ts +0 -3
- package/lib/Badge/_badgeStyleUtils.js +0 -39
- package/lib/TextInputTokens.d.ts +0 -43
- package/lib/TextInputTokens.js +0 -237
- package/lib/Token/Token.d.ts +0 -14
- package/lib/Token/Token.js +0 -76
- package/lib/Token/TokenBase.d.ts +0 -16
- package/lib/Token/TokenBase.js +0 -90
- package/lib/Token/TokenLabel.d.ts +0 -14
- package/lib/Token/TokenLabel.js +0 -141
- package/lib/Token/TokenProfile.d.ts +0 -7
- package/lib/Token/TokenProfile.js +0 -50
- package/lib/Token/_RemoveTokenButton.d.ts +0 -3
- package/lib/Token/_RemoveTokenButton.js +0 -45
- package/lib/Token/_tokenButtonUtils.d.ts +0 -10
- package/lib/Token/_tokenButtonUtils.js +0 -42
- package/lib/_UnstyledTextInput.d.ts +0 -2
- package/lib/_UnstyledTextInput.js +0 -20
- package/lib/utils/scrollIntoViewingArea.d.ts +0 -1
- package/lib/utils/scrollIntoViewingArea.js +0 -39
- package/lib-esm/Autocomplete/Autocomplete.d.ts +0 -31
- package/lib-esm/Autocomplete/Autocomplete.js +0 -40
- package/lib-esm/Autocomplete/AutocompleteContext.d.ts +0 -14
- package/lib-esm/Autocomplete/AutocompleteContext.js +0 -2
- package/lib-esm/Autocomplete/AutocompleteInput.d.ts +0 -9
- package/lib-esm/Autocomplete/AutocompleteInput.js +0 -129
- package/lib-esm/Autocomplete/AutocompleteMenu.d.ts +0 -78
- package/lib-esm/Autocomplete/AutocompleteMenu.js +0 -231
- package/lib-esm/Autocomplete/index.d.ts +0 -2
- package/lib-esm/Autocomplete/index.js +0 -1
- package/lib-esm/Badge/Badge.d.ts +0 -8
- package/lib-esm/Badge/Badge.js +0 -44
- package/lib-esm/Badge/BadgeState.d.ts +0 -13
- package/lib-esm/Badge/BadgeState.js +0 -40
- package/lib-esm/Badge/_badgeStyleUtils.d.ts +0 -3
- package/lib-esm/Badge/_badgeStyleUtils.js +0 -29
- package/lib-esm/TextInputTokens.d.ts +0 -43
- package/lib-esm/TextInputTokens.js +0 -210
- package/lib-esm/Token/Token.d.ts +0 -14
- package/lib-esm/Token/Token.js +0 -57
- package/lib-esm/Token/TokenBase.d.ts +0 -16
- package/lib-esm/Token/TokenBase.js +0 -70
- package/lib-esm/Token/TokenLabel.d.ts +0 -14
- package/lib-esm/Token/TokenLabel.js +0 -121
- package/lib-esm/Token/TokenProfile.d.ts +0 -7
- package/lib-esm/Token/TokenProfile.js +0 -29
- package/lib-esm/Token/_RemoveTokenButton.d.ts +0 -3
- package/lib-esm/Token/_RemoveTokenButton.js +0 -30
- package/lib-esm/Token/_tokenButtonUtils.d.ts +0 -10
- package/lib-esm/Token/_tokenButtonUtils.js +0 -26
- package/lib-esm/_UnstyledTextInput.d.ts +0 -2
- package/lib-esm/_UnstyledTextInput.js +0 -7
- package/lib-esm/utils/scrollIntoViewingArea.d.ts +0 -1
- package/lib-esm/utils/scrollIntoViewingArea.js +0 -30
@@ -2,7 +2,6 @@ import React from 'react';
|
|
2
2
|
import { OverlayProps } from '../Overlay';
|
3
3
|
import { FocusTrapHookSettings } from '../hooks/useFocusTrap';
|
4
4
|
import { FocusZoneHookSettings } from '../hooks/useFocusZone';
|
5
|
-
import { PositionSettings } from '../behaviors/anchoredPosition';
|
6
5
|
interface AnchoredOverlayPropsWithAnchor {
|
7
6
|
/**
|
8
7
|
* A custom function component used to render the anchor element.
|
@@ -53,7 +52,7 @@ interface AnchoredOverlayBaseProps extends Pick<OverlayProps, 'height' | 'width'
|
|
53
52
|
*/
|
54
53
|
focusZoneSettings?: Partial<FocusZoneHookSettings>;
|
55
54
|
}
|
56
|
-
export declare type AnchoredOverlayProps = AnchoredOverlayBaseProps & (AnchoredOverlayPropsWithAnchor | AnchoredOverlayPropsWithoutAnchor)
|
55
|
+
export declare type AnchoredOverlayProps = AnchoredOverlayBaseProps & (AnchoredOverlayPropsWithAnchor | AnchoredOverlayPropsWithoutAnchor);
|
57
56
|
/**
|
58
57
|
* An `AnchoredOverlay` provides an anchor that will open a floating overlay positioned relative to the anchor.
|
59
58
|
* The overlay can be opened and navigated using keyboard or mouse.
|
@@ -40,9 +40,7 @@ const AnchoredOverlay = ({
|
|
40
40
|
width,
|
41
41
|
overlayProps,
|
42
42
|
focusTrapSettings,
|
43
|
-
focusZoneSettings
|
44
|
-
side,
|
45
|
-
align
|
43
|
+
focusZoneSettings
|
46
44
|
}) => {
|
47
45
|
const anchorRef = (0, _hooks.useProvidedRefOrCreate)(externalAnchorRef);
|
48
46
|
const [overlayRef, updateOverlayRef] = (0, _hooks.useRenderForcingRef)();
|
@@ -72,9 +70,7 @@ const AnchoredOverlay = ({
|
|
72
70
|
position
|
73
71
|
} = (0, _hooks.useAnchoredPosition)({
|
74
72
|
anchorElementRef: anchorRef,
|
75
|
-
floatingElementRef: overlayRef
|
76
|
-
side,
|
77
|
-
align
|
73
|
+
floatingElementRef: overlayRef
|
78
74
|
}, [overlayRef.current]);
|
79
75
|
(0, _react.useEffect)(() => {
|
80
76
|
// ensure overlay ref gets cleared when closed, so position can reset between closing/re-opening
|
@@ -117,8 +113,4 @@ const AnchoredOverlay = ({
|
|
117
113
|
};
|
118
114
|
|
119
115
|
exports.AnchoredOverlay = AnchoredOverlay;
|
120
|
-
AnchoredOverlay.displayName = 'AnchoredOverlay';
|
121
|
-
AnchoredOverlay.defaultProps = {
|
122
|
-
side: 'outside-bottom',
|
123
|
-
align: 'start'
|
124
|
-
};
|
116
|
+
AnchoredOverlay.displayName = 'AnchoredOverlay';
|
@@ -117,13 +117,13 @@ const ConfirmationDialog = props => {
|
|
117
117
|
}, [onClose]);
|
118
118
|
const cancelButton = {
|
119
119
|
content: cancelButtonContent,
|
120
|
-
onClick: onCancelButtonClick
|
121
|
-
autoFocus: true
|
120
|
+
onClick: onCancelButtonClick
|
122
121
|
};
|
123
122
|
const confirmButton = {
|
124
123
|
content: confirmButtonContent,
|
125
124
|
buttonType: confirmButtonType,
|
126
|
-
onClick: onConfirmButtonClick
|
125
|
+
onClick: onConfirmButtonClick,
|
126
|
+
autoFocus: true
|
127
127
|
};
|
128
128
|
const footerButtons = [cancelButton, confirmButton];
|
129
129
|
return /*#__PURE__*/_react.default.createElement(_Dialog.Dialog, {
|
package/lib/Dialog/Dialog.d.ts
CHANGED
@@ -19,6 +19,11 @@ export declare type DialogButtonProps = ButtonProps & {
|
|
19
19
|
* focus this button automatically when the dialog appears.
|
20
20
|
*/
|
21
21
|
autoFocus?: boolean;
|
22
|
+
/**
|
23
|
+
* A reference to the rendered Button’s DOM node, used together with
|
24
|
+
* `autoFocus` for `focusTrap`’s `initialFocus`.
|
25
|
+
*/
|
26
|
+
ref?: React.RefObject<HTMLButtonElement>;
|
22
27
|
};
|
23
28
|
/**
|
24
29
|
* Props to customize the rendering of the Dialog.
|
package/lib/Dialog/Dialog.js
CHANGED
@@ -141,10 +141,19 @@ const _Dialog = /*#__PURE__*/_react.default.forwardRef((props, forwardedRef) =>
|
|
141
141
|
onClose,
|
142
142
|
role = 'dialog',
|
143
143
|
width = 'xlarge',
|
144
|
-
height = 'auto'
|
144
|
+
height = 'auto',
|
145
|
+
footerButtons = []
|
145
146
|
} = props;
|
146
147
|
const dialogLabelId = (0, _ssr.useSSRSafeId)();
|
147
148
|
const dialogDescriptionId = (0, _ssr.useSSRSafeId)();
|
149
|
+
const autoFocusedFooterButtonRef = (0, _react.useRef)(null);
|
150
|
+
|
151
|
+
for (const footerButton of footerButtons) {
|
152
|
+
if (footerButton.autoFocus) {
|
153
|
+
footerButton.ref = autoFocusedFooterButtonRef;
|
154
|
+
}
|
155
|
+
}
|
156
|
+
|
148
157
|
const defaultedProps = { ...props,
|
149
158
|
title,
|
150
159
|
subtitle,
|
@@ -157,7 +166,8 @@ const _Dialog = /*#__PURE__*/_react.default.forwardRef((props, forwardedRef) =>
|
|
157
166
|
const backdropRef = (0, _react.useRef)(null);
|
158
167
|
(0, _useFocusTrap.useFocusTrap)({
|
159
168
|
containerRef: dialogRef,
|
160
|
-
restoreFocusOnCleanUp: true
|
169
|
+
restoreFocusOnCleanUp: true,
|
170
|
+
initialFocusRef: autoFocusedFooterButtonRef
|
161
171
|
});
|
162
172
|
(0, _hooks.useOnEscapePress)(event => {
|
163
173
|
onClose('escape');
|
@@ -212,7 +222,9 @@ const buttonTypes = {
|
|
212
222
|
const Buttons = ({
|
213
223
|
buttons
|
214
224
|
}) => {
|
215
|
-
|
225
|
+
var _buttons$find;
|
226
|
+
|
227
|
+
const autoFocusRef = (0, _hooks.useProvidedRefOrCreate)((_buttons$find = buttons.find(button => button.autoFocus)) === null || _buttons$find === void 0 ? void 0 : _buttons$find.ref);
|
216
228
|
let autoFocusCount = 0;
|
217
229
|
const [hasRendered, setHasRendered] = (0, _react.useState)(0);
|
218
230
|
(0, _react.useEffect)(() => {
|
@@ -224,7 +236,7 @@ const Buttons = ({
|
|
224
236
|
} else {
|
225
237
|
setHasRendered(hasRendered + 1);
|
226
238
|
}
|
227
|
-
}, [hasRendered]);
|
239
|
+
}, [autoFocusRef, hasRendered]);
|
228
240
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, buttons.map((dialogButtonProps, index) => {
|
229
241
|
const {
|
230
242
|
content,
|
@@ -7,8 +7,6 @@ exports.FilteredActionList = FilteredActionList;
|
|
7
7
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
9
9
|
|
10
|
-
var _ssr = require("@react-aria/ssr");
|
11
|
-
|
12
10
|
var _TextInput = _interopRequireDefault(require("../TextInput"));
|
13
11
|
|
14
12
|
var _Box = _interopRequireDefault(require("../Box"));
|
@@ -29,7 +27,7 @@ var _useProvidedRefOrCreate = require("../hooks/useProvidedRefOrCreate");
|
|
29
27
|
|
30
28
|
var _useScrollFlash = _interopRequireDefault(require("../hooks/useScrollFlash"));
|
31
29
|
|
32
|
-
var
|
30
|
+
var _ssr = require("@react-aria/ssr");
|
33
31
|
|
34
32
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
35
33
|
|
@@ -39,6 +37,34 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
39
37
|
|
40
38
|
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
41
39
|
|
40
|
+
function scrollIntoViewingArea(child, container, margin = 8, behavior = 'smooth') {
|
41
|
+
const {
|
42
|
+
top: childTop,
|
43
|
+
bottom: childBottom
|
44
|
+
} = child.getBoundingClientRect();
|
45
|
+
const {
|
46
|
+
top: containerTop,
|
47
|
+
bottom: containerBottom
|
48
|
+
} = container.getBoundingClientRect();
|
49
|
+
const isChildTopAboveViewingArea = childTop < containerTop + margin;
|
50
|
+
const isChildBottomBelowViewingArea = childBottom > containerBottom - margin;
|
51
|
+
|
52
|
+
if (isChildTopAboveViewingArea) {
|
53
|
+
const scrollHeightToChildTop = childTop - containerTop + container.scrollTop;
|
54
|
+
container.scrollTo({
|
55
|
+
behavior,
|
56
|
+
top: scrollHeightToChildTop - margin
|
57
|
+
});
|
58
|
+
} else if (isChildBottomBelowViewingArea) {
|
59
|
+
const scrollHeightToChildBottom = childBottom - containerBottom + container.scrollTop;
|
60
|
+
container.scrollTo({
|
61
|
+
behavior,
|
62
|
+
top: scrollHeightToChildBottom + margin
|
63
|
+
});
|
64
|
+
} // either completely in view or outside viewing area on both ends, don't scroll
|
65
|
+
|
66
|
+
}
|
67
|
+
|
42
68
|
const StyledHeader = _styledComponents.default.div.withConfig({
|
43
69
|
displayName: "FilteredActionList__StyledHeader",
|
44
70
|
componentId: "yg3jkv-0"
|
@@ -85,7 +111,7 @@ function FilteredActionList({
|
|
85
111
|
activeDescendantRef.current = current;
|
86
112
|
|
87
113
|
if (current && scrollContainerRef.current && directlyActivated) {
|
88
|
-
|
114
|
+
scrollIntoViewingArea(current, scrollContainerRef.current);
|
89
115
|
}
|
90
116
|
}
|
91
117
|
}, [// List ref isn't set while loading. Need to re-bind focus zone when it changes
|
@@ -93,7 +119,7 @@ function FilteredActionList({
|
|
93
119
|
(0, _react.useEffect)(() => {
|
94
120
|
// if items changed, we want to instantly move active descendant into view
|
95
121
|
if (activeDescendantRef.current && scrollContainerRef.current) {
|
96
|
-
|
122
|
+
scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, undefined, 'auto');
|
97
123
|
}
|
98
124
|
}, [items]);
|
99
125
|
(0, _useScrollFlash.default)(scrollContainerRef);
|
package/lib/Overlay.d.ts
CHANGED
@@ -4,7 +4,7 @@ import { ComponentProps } from './utils/types';
|
|
4
4
|
import { TouchOrMouseEvent } from './hooks';
|
5
5
|
import { SxProp } from './sx';
|
6
6
|
import { AnchorSide } from './behaviors/anchoredPosition';
|
7
|
-
|
7
|
+
declare type StyledOverlayProps = {
|
8
8
|
width?: keyof typeof widthMap;
|
9
9
|
height?: keyof typeof heightMap;
|
10
10
|
maxHeight?: keyof Omit<typeof heightMap, 'auto' | 'initial'>;
|
@@ -40,7 +40,6 @@ export declare type OverlayProps = {
|
|
40
40
|
top: number;
|
41
41
|
left: number;
|
42
42
|
portalContainerName?: string;
|
43
|
-
preventFocusOnOpen?: boolean;
|
44
43
|
} & Omit<ComponentProps<typeof StyledOverlay>, 'visibility' | keyof SystemPositionProps>;
|
45
44
|
/**
|
46
45
|
* An `Overlay` is a flexible floating surface, used to display transient content such as menus,
|
package/lib/Overlay.js
CHANGED
@@ -113,7 +113,6 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
|
|
113
113
|
left,
|
114
114
|
anchorSide,
|
115
115
|
portalContainerName,
|
116
|
-
preventFocusOnOpen,
|
117
116
|
...rest
|
118
117
|
}, forwardedRef) => {
|
119
118
|
const overlayRef = (0, _react.useRef)(null);
|
@@ -129,8 +128,7 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
|
|
129
128
|
onEscape,
|
130
129
|
ignoreClickRefs,
|
131
130
|
onClickOutside,
|
132
|
-
initialFocusRef
|
133
|
-
preventFocusOnOpen
|
131
|
+
initialFocusRef
|
134
132
|
});
|
135
133
|
(0, _react.useEffect)(() => {
|
136
134
|
var _combinedRef$current;
|
@@ -159,8 +157,9 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
|
|
159
157
|
easing: slideAnimationEasing
|
160
158
|
});
|
161
159
|
}, [anchorSide, slideAnimationDistance, slideAnimationEasing, visibility]);
|
162
|
-
|
163
|
-
|
160
|
+
return /*#__PURE__*/_react.default.createElement(_Portal.default, {
|
161
|
+
containerName: portalContainerName
|
162
|
+
}, /*#__PURE__*/_react.default.createElement(StyledOverlay, _extends({
|
164
163
|
height: height,
|
165
164
|
role: role
|
166
165
|
}, rest, {
|
@@ -171,11 +170,7 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
|
|
171
170
|
...rest.style,
|
172
171
|
'--styled-overlay-visibility': visibility
|
173
172
|
}
|
174
|
-
}));
|
175
|
-
|
176
|
-
return /*#__PURE__*/_react.default.createElement(_Portal.default, {
|
177
|
-
containerName: portalContainerName
|
178
|
-
}, styledOverlay);
|
173
|
+
})));
|
179
174
|
});
|
180
175
|
|
181
176
|
Overlay.defaultProps = {
|
@@ -32,15 +32,11 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
|
|
32
32
|
Divider: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
|
33
33
|
Filter: React.ForwardRefExoticComponent<Pick<{
|
34
34
|
value?: string | undefined;
|
35
|
-
} &
|
36
|
-
ref?: ((instance: HTMLInputElement | null) => void) | React.RefObject<HTMLInputElement> | null | undefined;
|
37
|
-
}, string | number | symbol> & {
|
35
|
+
} & Pick<{
|
38
36
|
className?: string | undefined;
|
39
37
|
icon?: React.ComponentType<{
|
40
38
|
className?: string | undefined;
|
41
39
|
}> | undefined;
|
42
|
-
inputComponent?: React.ComponentType<HTMLInputElement> | undefined;
|
43
|
-
wrapperRef?: React.RefObject<HTMLSpanElement> | undefined;
|
44
40
|
} & Pick<{
|
45
41
|
color?: string | undefined;
|
46
42
|
maxWidth?: import("styled-system").ResponsiveValue<import("csstype").Property.MaxWidth<import("styled-system").TLengthStyledSystem>, Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> | undefined;
|
@@ -319,9 +315,7 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
|
|
319
315
|
} & {
|
320
316
|
as?: string | React.ComponentType<any> | undefined;
|
321
317
|
forwardedAs?: string | React.ComponentType<any> | undefined;
|
322
|
-
}, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast" |
|
323
|
-
as?: "input" | undefined;
|
324
|
-
}, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
|
318
|
+
}, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement>, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
|
325
319
|
Footer: import("styled-components").StyledComponent<"footer", any, SystemCommonProps & SxProp, never>;
|
326
320
|
Item: React.ForwardRefExoticComponent<Pick<{
|
327
321
|
as?: React.ElementType<any> | undefined;
|
package/lib/TextInput.d.ts
CHANGED
@@ -1,9 +1,8 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { MaxWidthProps, MinWidthProps, WidthProps } from 'styled-system';
|
3
|
-
import type * as Polymorphic from "@radix-ui/react-polymorphic";
|
4
3
|
import { SxProp } from './sx';
|
5
4
|
import { ComponentProps } from './utils/types';
|
6
|
-
import
|
5
|
+
declare const Input: import("styled-components").StyledComponent<"input", any, {}, never>;
|
7
6
|
declare const Wrapper: import("styled-components").StyledComponent<"span", any, {
|
8
7
|
disabled?: boolean | undefined;
|
9
8
|
hasIcon?: boolean | undefined;
|
@@ -16,10 +15,8 @@ declare type NonPassthroughProps = {
|
|
16
15
|
icon?: React.ComponentType<{
|
17
16
|
className?: string;
|
18
17
|
}>;
|
19
|
-
inputComponent?: React.ComponentType<HTMLInputElement>;
|
20
|
-
wrapperRef?: React.RefObject<HTMLSpanElement>;
|
21
18
|
} & Pick<ComponentProps<typeof Wrapper>, 'block' | 'contrast' | 'disabled' | 'sx' | 'theme' | 'width' | 'maxWidth' | 'minWidth' | 'variant'>;
|
22
|
-
declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof
|
23
|
-
declare const TextInput:
|
19
|
+
declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof Input>, keyof NonPassthroughProps>;
|
20
|
+
declare const TextInput: React.ForwardRefExoticComponent<Pick<TextInputInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
|
24
21
|
export declare type TextInputProps = ComponentProps<typeof TextInput>;
|
25
22
|
export default TextInput;
|
package/lib/TextInput.js
CHANGED
@@ -17,8 +17,6 @@ var _constants = require("./constants");
|
|
17
17
|
|
18
18
|
var _sx = _interopRequireDefault(require("./sx"));
|
19
19
|
|
20
|
-
var _UnstyledTextInput = _interopRequireDefault(require("./_UnstyledTextInput"));
|
21
|
-
|
22
20
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
23
21
|
|
24
22
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
@@ -44,20 +42,25 @@ const sizeVariants = (0, _styledSystem.variant)({
|
|
44
42
|
}
|
45
43
|
});
|
46
44
|
|
45
|
+
const Input = _styledComponents.default.input.withConfig({
|
46
|
+
displayName: "TextInput__Input",
|
47
|
+
componentId: "sc-1apmpmt-0"
|
48
|
+
})(["border:0;font-size:inherit;font-family:inherit;background-color:transparent;-webkit-appearance:none;color:inherit;width:100%;&:focus{outline:0;}"]);
|
49
|
+
|
47
50
|
const Wrapper = _styledComponents.default.span.withConfig({
|
48
51
|
displayName: "TextInput__Wrapper",
|
49
|
-
componentId: "sc-1apmpmt-
|
52
|
+
componentId: "sc-1apmpmt-1"
|
50
53
|
})(["display:inline-flex;align-items:stretch;min-height:34px;font-size:", ";line-height:20px;color:", ";vertical-align:middle;background-repeat:no-repeat;background-position:right 8px center;border:1px solid ", ";border-radius:", ";outline:none;box-shadow:", ";", " .TextInput-icon{align-self:center;color:", ";margin:0 ", ";flex-shrink:0;}&:focus-within{border-color:", ";box-shadow:", ";}", " ", " ", " @media (min-width:", "){font-size:", ";}", " ", " ", " ", " ", ";"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('colors.fg.default'), (0, _constants.get)('colors.border.default'), (0, _constants.get)('radii.2'), (0, _constants.get)('shadows.primer.shadow.inset'), props => {
|
51
54
|
if (props.hasIcon) {
|
52
55
|
return (0, _styledComponents.css)(["padding:0;"]);
|
53
56
|
} else {
|
54
57
|
return (0, _styledComponents.css)(["padding:6px 12px;"]);
|
55
58
|
}
|
56
|
-
}, (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.2'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('shadows.primer.shadow.focus'), props => props.contrast && (0, _styledComponents.css)(["background-color:", ";"], (0, _constants.get)('colors.canvas.inset')), props => props.disabled && (0, _styledComponents.css)(["color:", ";background-color:", ";border-color:", ";"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.input.disabledBg'), (0, _constants.get)('colors.border.default')), props => props.block && (0, _styledComponents.css)(["display:block;width:100%;"]), (0, _constants.get)('breakpoints.1'), (0, _constants.get)('fontSizes.1'), _styledSystem.width, _styledSystem.minWidth, _styledSystem.maxWidth, sizeVariants, _sx.default);
|
59
|
+
}, (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.2'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('shadows.primer.shadow.focus'), props => props.contrast && (0, _styledComponents.css)(["background-color:", ";"], (0, _constants.get)('colors.canvas.inset')), props => props.disabled && (0, _styledComponents.css)(["color:", ";background-color:", ";border-color:", ";"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.input.disabledBg'), (0, _constants.get)('colors.border.default')), props => props.block && (0, _styledComponents.css)(["display:block;width:100%;"]), (0, _constants.get)('breakpoints.1'), (0, _constants.get)('fontSizes.1'), _styledSystem.width, _styledSystem.minWidth, _styledSystem.maxWidth, sizeVariants, _sx.default); // Props that are not passed through to Input:
|
60
|
+
|
57
61
|
|
58
62
|
// using forwardRef is important so that other components (ex. SelectMenu) can autofocus the input
|
59
63
|
const TextInput = /*#__PURE__*/_react.default.forwardRef(({
|
60
|
-
inputComponent: InputComponent,
|
61
64
|
icon: IconComponent,
|
62
65
|
block,
|
63
66
|
className,
|
@@ -69,7 +72,6 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
|
|
69
72
|
minWidth: minWidthProp,
|
70
73
|
maxWidth: maxWidthProp,
|
71
74
|
variant: variantProp,
|
72
|
-
wrapperRef,
|
73
75
|
...inputProps
|
74
76
|
}, ref) => {
|
75
77
|
// this class is necessary to style FilterSearch, plz no touchy!
|
@@ -85,11 +87,10 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
|
|
85
87
|
width: widthProp,
|
86
88
|
minWidth: minWidthProp,
|
87
89
|
maxWidth: maxWidthProp,
|
88
|
-
variant: variantProp
|
89
|
-
ref: wrapperRef
|
90
|
+
variant: variantProp
|
90
91
|
}, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
|
91
92
|
className: "TextInput-icon"
|
92
|
-
}), /*#__PURE__*/_react.default.createElement(
|
93
|
+
}), /*#__PURE__*/_react.default.createElement(Input, _extends({
|
93
94
|
ref: ref,
|
94
95
|
disabled: disabled
|
95
96
|
}, inputProps)));
|
@@ -7,9 +7,8 @@ export declare type UseOverlaySettings = {
|
|
7
7
|
onEscape: (e: KeyboardEvent) => void;
|
8
8
|
onClickOutside: (e: TouchOrMouseEvent) => void;
|
9
9
|
overlayRef?: React.RefObject<HTMLDivElement>;
|
10
|
-
preventFocusOnOpen?: boolean;
|
11
10
|
};
|
12
11
|
export declare type OverlayReturnProps = {
|
13
12
|
ref: React.RefObject<HTMLDivElement>;
|
14
13
|
};
|
15
|
-
export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside
|
14
|
+
export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside }: UseOverlaySettings) => OverlayReturnProps;
|
package/lib/hooks/useOverlay.js
CHANGED
@@ -19,19 +19,14 @@ const useOverlay = ({
|
|
19
19
|
initialFocusRef,
|
20
20
|
onEscape,
|
21
21
|
ignoreClickRefs,
|
22
|
-
onClickOutside
|
23
|
-
preventFocusOnOpen
|
22
|
+
onClickOutside
|
24
23
|
}) => {
|
25
24
|
const overlayRef = (0, _useProvidedRefOrCreate.useProvidedRefOrCreate)(_overlayRef);
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
initialFocusRef
|
32
|
-
});
|
33
|
-
}
|
34
|
-
|
25
|
+
(0, _useOpenAndCloseFocus.useOpenAndCloseFocus)({
|
26
|
+
containerRef: overlayRef,
|
27
|
+
returnFocusRef,
|
28
|
+
initialFocusRef
|
29
|
+
});
|
35
30
|
(0, _useOnOutsideClick.useOnOutsideClick)({
|
36
31
|
containerRef: overlayRef,
|
37
32
|
ignoreClickRefs,
|
package/lib/index.d.ts
CHANGED
@@ -24,7 +24,6 @@ export { useConfirm } from './Dialog/ConfirmationDialog';
|
|
24
24
|
export { ActionList } from './ActionList';
|
25
25
|
export { ActionMenu } from './ActionMenu';
|
26
26
|
export type { ActionMenuProps } from './ActionMenu';
|
27
|
-
export { default as Autocomplete } from './Autocomplete';
|
28
27
|
export { default as Avatar } from './Avatar';
|
29
28
|
export type { AvatarProps } from './Avatar';
|
30
29
|
export { default as AvatarPair } from './AvatarPair';
|
@@ -99,7 +98,6 @@ export { default as TabNav } from './TabNav';
|
|
99
98
|
export type { TabNavProps, TabNavLinkProps } from './TabNav';
|
100
99
|
export { default as TextInput } from './TextInput';
|
101
100
|
export type { TextInputProps } from './TextInput';
|
102
|
-
export { default as TextInputWithTokens } from './TextInputTokens';
|
103
101
|
export { default as Text } from './Text';
|
104
102
|
export type { TextProps } from './Text';
|
105
103
|
export { default as Timeline } from './Timeline';
|
package/lib/index.js
CHANGED
@@ -153,12 +153,6 @@ Object.defineProperty(exports, "ActionMenu", {
|
|
153
153
|
return _ActionMenu.ActionMenu;
|
154
154
|
}
|
155
155
|
});
|
156
|
-
Object.defineProperty(exports, "Autocomplete", {
|
157
|
-
enumerable: true,
|
158
|
-
get: function () {
|
159
|
-
return _Autocomplete.default;
|
160
|
-
}
|
161
|
-
});
|
162
156
|
Object.defineProperty(exports, "Avatar", {
|
163
157
|
enumerable: true,
|
164
158
|
get: function () {
|
@@ -435,12 +429,6 @@ Object.defineProperty(exports, "TextInput", {
|
|
435
429
|
return _TextInput.default;
|
436
430
|
}
|
437
431
|
});
|
438
|
-
Object.defineProperty(exports, "TextInputWithTokens", {
|
439
|
-
enumerable: true,
|
440
|
-
get: function () {
|
441
|
-
return _TextInputTokens.default;
|
442
|
-
}
|
443
|
-
});
|
444
432
|
Object.defineProperty(exports, "Text", {
|
445
433
|
enumerable: true,
|
446
434
|
get: function () {
|
@@ -520,8 +508,6 @@ var _ActionList = require("./ActionList");
|
|
520
508
|
|
521
509
|
var _ActionMenu = require("./ActionMenu");
|
522
510
|
|
523
|
-
var _Autocomplete = _interopRequireDefault(require("./Autocomplete"));
|
524
|
-
|
525
511
|
var _Avatar = _interopRequireDefault(require("./Avatar"));
|
526
512
|
|
527
513
|
var _AvatarPair = _interopRequireDefault(require("./AvatarPair"));
|
@@ -596,8 +582,6 @@ var _TabNav = _interopRequireDefault(require("./TabNav"));
|
|
596
582
|
|
597
583
|
var _TextInput = _interopRequireDefault(require("./TextInput"));
|
598
584
|
|
599
|
-
var _TextInputTokens = _interopRequireDefault(require("./TextInputTokens"));
|
600
|
-
|
601
585
|
var _Text = _interopRequireDefault(require("./Text"));
|
602
586
|
|
603
587
|
var _Timeline = _interopRequireDefault(require("./Timeline"));
|
package/lib/utils/types.d.ts
CHANGED
@@ -12,6 +12,3 @@ export declare type ComponentProps<T> = T extends React.ComponentType<infer Prop
|
|
12
12
|
*/
|
13
13
|
export declare type Flatten<T extends unknown> = T extends (infer U)[] ? U : never;
|
14
14
|
export declare type AriaRole = 'alert' | 'alertdialog' | 'application' | 'article' | 'banner' | 'button' | 'cell' | 'checkbox' | 'columnheader' | 'combobox' | 'complementary' | 'contentinfo' | 'definition' | 'dialog' | 'directory' | 'document' | 'feed' | 'figure' | 'form' | 'grid' | 'gridcell' | 'group' | 'heading' | 'img' | 'link' | 'list' | 'listbox' | 'listitem' | 'log' | 'main' | 'marquee' | 'math' | 'menu' | 'menubar' | 'menuitem' | 'menuitemcheckbox ' | 'menuitemradio' | 'navigation' | 'none' | 'note' | 'option' | 'presentation' | 'progressbar' | 'radio' | 'radiogroup' | 'region' | 'row' | 'rowgroup' | 'rowheader' | 'scrollbar' | 'search' | 'searchbox' | 'separator' | 'slider' | 'spinbutton' | 'status' | 'switch' | 'tab' | 'table' | 'tablist' | 'tabpanel' | 'term' | 'textbox' | 'timer' | 'toolbar' | 'tooltip' | 'tree' | 'treegrid' | 'treeitem';
|
15
|
-
export declare type MandateProps<T extends {}, K extends keyof T> = Omit<T, K> & {
|
16
|
-
[MK in K]-?: NonNullable<T[MK]>;
|
17
|
-
};
|
@@ -2,7 +2,6 @@ import React from 'react';
|
|
2
2
|
import { OverlayProps } from '../Overlay';
|
3
3
|
import { FocusTrapHookSettings } from '../hooks/useFocusTrap';
|
4
4
|
import { FocusZoneHookSettings } from '../hooks/useFocusZone';
|
5
|
-
import { PositionSettings } from '../behaviors/anchoredPosition';
|
6
5
|
interface AnchoredOverlayPropsWithAnchor {
|
7
6
|
/**
|
8
7
|
* A custom function component used to render the anchor element.
|
@@ -53,7 +52,7 @@ interface AnchoredOverlayBaseProps extends Pick<OverlayProps, 'height' | 'width'
|
|
53
52
|
*/
|
54
53
|
focusZoneSettings?: Partial<FocusZoneHookSettings>;
|
55
54
|
}
|
56
|
-
export declare type AnchoredOverlayProps = AnchoredOverlayBaseProps & (AnchoredOverlayPropsWithAnchor | AnchoredOverlayPropsWithoutAnchor)
|
55
|
+
export declare type AnchoredOverlayProps = AnchoredOverlayBaseProps & (AnchoredOverlayPropsWithAnchor | AnchoredOverlayPropsWithoutAnchor);
|
57
56
|
/**
|
58
57
|
* An `AnchoredOverlay` provides an anchor that will open a floating overlay positioned relative to the anchor.
|
59
58
|
* The overlay can be opened and navigated using keyboard or mouse.
|
@@ -22,9 +22,7 @@ export const AnchoredOverlay = ({
|
|
22
22
|
width,
|
23
23
|
overlayProps,
|
24
24
|
focusTrapSettings,
|
25
|
-
focusZoneSettings
|
26
|
-
side,
|
27
|
-
align
|
25
|
+
focusZoneSettings
|
28
26
|
}) => {
|
29
27
|
const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
|
30
28
|
const [overlayRef, updateOverlayRef] = useRenderForcingRef();
|
@@ -54,9 +52,7 @@ export const AnchoredOverlay = ({
|
|
54
52
|
position
|
55
53
|
} = useAnchoredPosition({
|
56
54
|
anchorElementRef: anchorRef,
|
57
|
-
floatingElementRef: overlayRef
|
58
|
-
side,
|
59
|
-
align
|
55
|
+
floatingElementRef: overlayRef
|
60
56
|
}, [overlayRef.current]);
|
61
57
|
useEffect(() => {
|
62
58
|
// ensure overlay ref gets cleared when closed, so position can reset between closing/re-opening
|
@@ -97,8 +93,4 @@ export const AnchoredOverlay = ({
|
|
97
93
|
anchorSide: position === null || position === void 0 ? void 0 : position.anchorSide
|
98
94
|
}, overlayProps), children) : null);
|
99
95
|
};
|
100
|
-
AnchoredOverlay.displayName = 'AnchoredOverlay';
|
101
|
-
AnchoredOverlay.defaultProps = {
|
102
|
-
side: 'outside-bottom',
|
103
|
-
align: 'start'
|
104
|
-
};
|
96
|
+
AnchoredOverlay.displayName = 'AnchoredOverlay';
|
@@ -97,13 +97,13 @@ export const ConfirmationDialog = props => {
|
|
97
97
|
}, [onClose]);
|
98
98
|
const cancelButton = {
|
99
99
|
content: cancelButtonContent,
|
100
|
-
onClick: onCancelButtonClick
|
101
|
-
autoFocus: true
|
100
|
+
onClick: onCancelButtonClick
|
102
101
|
};
|
103
102
|
const confirmButton = {
|
104
103
|
content: confirmButtonContent,
|
105
104
|
buttonType: confirmButtonType,
|
106
|
-
onClick: onConfirmButtonClick
|
105
|
+
onClick: onConfirmButtonClick,
|
106
|
+
autoFocus: true
|
107
107
|
};
|
108
108
|
const footerButtons = [cancelButton, confirmButton];
|
109
109
|
return /*#__PURE__*/React.createElement(Dialog, {
|
@@ -19,6 +19,11 @@ export declare type DialogButtonProps = ButtonProps & {
|
|
19
19
|
* focus this button automatically when the dialog appears.
|
20
20
|
*/
|
21
21
|
autoFocus?: boolean;
|
22
|
+
/**
|
23
|
+
* A reference to the rendered Button’s DOM node, used together with
|
24
|
+
* `autoFocus` for `focusTrap`’s `initialFocus`.
|
25
|
+
*/
|
26
|
+
ref?: React.RefObject<HTMLButtonElement>;
|
22
27
|
};
|
23
28
|
/**
|
24
29
|
* Props to customize the rendering of the Dialog.
|
package/lib-esm/Dialog/Dialog.js
CHANGED
@@ -5,7 +5,7 @@ import styled from 'styled-components';
|
|
5
5
|
import Button, { ButtonPrimary, ButtonDanger } from '../Button';
|
6
6
|
import Box from '../Box';
|
7
7
|
import { get, COMMON, POSITION } from '../constants';
|
8
|
-
import { useOnEscapePress } from '../hooks';
|
8
|
+
import { useOnEscapePress, useProvidedRefOrCreate } from '../hooks';
|
9
9
|
import { useFocusTrap } from '../hooks/useFocusTrap';
|
10
10
|
import sx from '../sx';
|
11
11
|
import StyledOcticon from '../StyledOcticon';
|
@@ -112,10 +112,19 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
|
|
112
112
|
onClose,
|
113
113
|
role = 'dialog',
|
114
114
|
width = 'xlarge',
|
115
|
-
height = 'auto'
|
115
|
+
height = 'auto',
|
116
|
+
footerButtons = []
|
116
117
|
} = props;
|
117
118
|
const dialogLabelId = useSSRSafeId();
|
118
119
|
const dialogDescriptionId = useSSRSafeId();
|
120
|
+
const autoFocusedFooterButtonRef = useRef(null);
|
121
|
+
|
122
|
+
for (const footerButton of footerButtons) {
|
123
|
+
if (footerButton.autoFocus) {
|
124
|
+
footerButton.ref = autoFocusedFooterButtonRef;
|
125
|
+
}
|
126
|
+
}
|
127
|
+
|
119
128
|
const defaultedProps = { ...props,
|
120
129
|
title,
|
121
130
|
subtitle,
|
@@ -128,7 +137,8 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
|
|
128
137
|
const backdropRef = useRef(null);
|
129
138
|
useFocusTrap({
|
130
139
|
containerRef: dialogRef,
|
131
|
-
restoreFocusOnCleanUp: true
|
140
|
+
restoreFocusOnCleanUp: true,
|
141
|
+
initialFocusRef: autoFocusedFooterButtonRef
|
132
142
|
});
|
133
143
|
useOnEscapePress(event => {
|
134
144
|
onClose('escape');
|
@@ -183,7 +193,9 @@ const buttonTypes = {
|
|
183
193
|
const Buttons = ({
|
184
194
|
buttons
|
185
195
|
}) => {
|
186
|
-
|
196
|
+
var _buttons$find;
|
197
|
+
|
198
|
+
const autoFocusRef = useProvidedRefOrCreate((_buttons$find = buttons.find(button => button.autoFocus)) === null || _buttons$find === void 0 ? void 0 : _buttons$find.ref);
|
187
199
|
let autoFocusCount = 0;
|
188
200
|
const [hasRendered, setHasRendered] = useState(0);
|
189
201
|
useEffect(() => {
|
@@ -195,7 +207,7 @@ const Buttons = ({
|
|
195
207
|
} else {
|
196
208
|
setHasRendered(hasRendered + 1);
|
197
209
|
}
|
198
|
-
}, [hasRendered]);
|
210
|
+
}, [autoFocusRef, hasRendered]);
|
199
211
|
return /*#__PURE__*/React.createElement(React.Fragment, null, buttons.map((dialogButtonProps, index) => {
|
200
212
|
const {
|
201
213
|
content,
|