@primer/react 0.0.0-20260304110422 → 0.0.0-20260304123418
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @primer/react
|
|
2
2
|
|
|
3
|
-
## 0.0.0-
|
|
3
|
+
## 0.0.0-20260304123418
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
- Improves initial render performance for `ActionBar`
|
|
16
16
|
|
|
17
|
-
- [#
|
|
17
|
+
- [#7621](https://github.com/primer/react/pull/7621) [`82bab6d`](https://github.com/primer/react/commit/82bab6d4014693f08e40d58ead630a42c751658b) Thanks [@hectahertz](https://github.com/hectahertz)! - Memoize SelectPanel overlayProps, focusTrapSettings, and preventBubbling to reduce allocations on re-renders
|
|
18
18
|
|
|
19
19
|
- [#7617](https://github.com/primer/react/pull/7617) [`79c855a`](https://github.com/primer/react/commit/79c855abeb6f46d3fefafb236f00ea65dfcd1ed4) Thanks [@llastflowers](https://github.com/llastflowers)! - Push margin-top of TimelineBody +1px
|
|
20
20
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionMenu.d.ts","sourceRoot":"","sources":["../../src/ActionMenu/ActionMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAA;AAElF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AAE5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAI5C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAIrD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAK/F,OAAO,KAAK,EAAC,gBAAgB,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAA;AAI1E,MAAM,MAAM,gBAAgB,GAAG,CAC7B,OAAO,EAAE,cAAc,GAAG,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,aAAa,GAAG,YAAY,GAAG,OAAO,KAClG,IAAI,CAAA;AAET,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,oBAAoB,EACpB,WAAW,GAAG,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,CAC9D,GAAG;IACF,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAGD,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IAEH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IAE7D;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IAEd;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CACpC,GAAG,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAA;AAsI3C,MAAM,MAAM,qBAAqB,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;AA0DxH,6CAA6C;AAC7C,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAA;AAe/C,KAAK,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,GAC3C,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,mBAAmB,CAAC,GAAG;IAC/E;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,gBAAgB,CAAC,EAAE,CAAC,EAAC,QAAQ,EAAC,EAAE;QAAC,QAAQ,EAAE,cAAc,CAAA;KAAC,KAAK,IAAI,CAAA;CACpE,CAAA;
|
|
1
|
+
{"version":3,"file":"ActionMenu.d.ts","sourceRoot":"","sources":["../../src/ActionMenu/ActionMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8D,MAAM,OAAO,CAAA;AAElF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AAE5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAI5C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAIrD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAK/F,OAAO,KAAK,EAAC,gBAAgB,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAA;AAI1E,MAAM,MAAM,gBAAgB,GAAG,CAC7B,OAAO,EAAE,cAAc,GAAG,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,aAAa,GAAG,YAAY,GAAG,OAAO,KAClG,IAAI,CAAA;AAET,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,oBAAoB,EACpB,WAAW,GAAG,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,CAC9D,GAAG;IACF,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAGD,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IAEH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IAE7D;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IAEd;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CACpC,GAAG,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAA;AAsI3C,MAAM,MAAM,qBAAqB,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;AA0DxH,6CAA6C;AAC7C,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAA;AAe/C,KAAK,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,GAC3C,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,mBAAmB,CAAC,GAAG;IAC/E;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,gBAAgB,CAAC,EAAE,CAAC,EAAC,QAAQ,EAAC,EAAE;QAAC,QAAQ,EAAE,cAAc,CAAA;KAAC,KAAK,IAAI,CAAA;CACpE,CAAA;AAgHH,eAAO,MAAM,UAAU;;;kBA5LP,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC;aAC5B,MAAM;;;;CA2L4E,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useContext,
|
|
1
|
+
import React, { useContext, useState, useEffect, useCallback, useMemo } from 'react';
|
|
2
2
|
import { ChevronRightIcon, TriangleDownIcon } from '@primer/octicons-react';
|
|
3
3
|
import { Divider } from '../ActionList/Divider.js';
|
|
4
4
|
import { ActionListContainerContext } from '../ActionList/ActionListContainerContext.js';
|
|
@@ -130,18 +130,17 @@ const Menu = ({
|
|
|
130
130
|
return child;
|
|
131
131
|
}
|
|
132
132
|
});
|
|
133
|
-
const isSubmenu = parentMenuContext.isSubmenu !== undefined;
|
|
134
|
-
const menuContextValue = useMemo(() => ({
|
|
135
|
-
anchorRef,
|
|
136
|
-
renderAnchor,
|
|
137
|
-
anchorId,
|
|
138
|
-
open: combinedOpenState,
|
|
139
|
-
onOpen,
|
|
140
|
-
onClose,
|
|
141
|
-
isSubmenu
|
|
142
|
-
}), [anchorRef, renderAnchor, anchorId, combinedOpenState, onOpen, onClose, isSubmenu]);
|
|
143
133
|
return /*#__PURE__*/jsx(MenuContext.Provider, {
|
|
144
|
-
value:
|
|
134
|
+
value: {
|
|
135
|
+
anchorRef,
|
|
136
|
+
renderAnchor,
|
|
137
|
+
anchorId,
|
|
138
|
+
open: combinedOpenState,
|
|
139
|
+
onOpen,
|
|
140
|
+
onClose,
|
|
141
|
+
// will be undefined for the outermost level, then false for the top menu, then true inside that
|
|
142
|
+
isSubmenu: parentMenuContext.isSubmenu !== undefined
|
|
143
|
+
},
|
|
145
144
|
children: contents
|
|
146
145
|
});
|
|
147
146
|
};
|
|
@@ -257,15 +256,6 @@ const Overlay = ({
|
|
|
257
256
|
}
|
|
258
257
|
}
|
|
259
258
|
}, [anchorRef]);
|
|
260
|
-
const afterSelect = useCallback(() => onClose === null || onClose === void 0 ? void 0 : onClose('item-select'), [onClose]);
|
|
261
|
-
const overlayContextValue = useMemo(() => ({
|
|
262
|
-
container: 'ActionMenu',
|
|
263
|
-
listRole: 'menu',
|
|
264
|
-
listLabelledBy: ariaLabelledby || anchorAriaLabelledby || anchorId,
|
|
265
|
-
selectionAttribute: 'aria-checked',
|
|
266
|
-
afterSelect,
|
|
267
|
-
enableFocusZone: isNarrowFullscreen
|
|
268
|
-
}), [ariaLabelledby, anchorAriaLabelledby, anchorId, afterSelect, isNarrowFullscreen]);
|
|
269
259
|
const featureFlagDisplayInViewportInsideDialog = useFeatureFlag('primer_react_action_menu_display_in_viewport_inside_dialog');
|
|
270
260
|
const isInsideDialog = useContext(DialogContext) !== undefined;
|
|
271
261
|
return /*#__PURE__*/jsx(AnchoredOverlay, {
|
|
@@ -297,7 +287,16 @@ const Overlay = ({
|
|
|
297
287
|
[`data-max-height-${overlayProps.maxHeight}`]: ''
|
|
298
288
|
} : {}),
|
|
299
289
|
children: /*#__PURE__*/jsx(ActionListContainerContext.Provider, {
|
|
300
|
-
value:
|
|
290
|
+
value: {
|
|
291
|
+
container: 'ActionMenu',
|
|
292
|
+
listRole: 'menu',
|
|
293
|
+
// If there is a custom aria-labelledby, use that. Otherwise, if exists, use the id that labels the anchor such as tooltip. If none of them exist, use anchor id.
|
|
294
|
+
listLabelledBy: ariaLabelledby || anchorAriaLabelledby || anchorId,
|
|
295
|
+
selectionAttribute: 'aria-checked',
|
|
296
|
+
// Should this be here?
|
|
297
|
+
afterSelect: () => onClose === null || onClose === void 0 ? void 0 : onClose('item-select'),
|
|
298
|
+
enableFocusZone: isNarrowFullscreen // AnchoredOverlay takes care of focus zone. We only want to enable this if menu is narrow fullscreen.
|
|
299
|
+
},
|
|
301
300
|
children: children
|
|
302
301
|
})
|
|
303
302
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectPanel.d.ts","sourceRoot":"","sources":["../../src/SelectPanel/SelectPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAC1F,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"SelectPanel.d.ts","sourceRoot":"","sources":["../../src/SelectPanel/SelectPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,9 @@ const focusZoneSettings = {
|
|
|
55
55
|
// Let FilteredActionList handle focus zone
|
|
56
56
|
disabled: true
|
|
57
57
|
};
|
|
58
|
+
const closeButtonProps = {
|
|
59
|
+
'aria-label': 'Cancel and close'
|
|
60
|
+
};
|
|
58
61
|
const areItemsEqual = (itemA, itemB) => {
|
|
59
62
|
// prefer checking equivality by item.id
|
|
60
63
|
if (typeof itemA.id !== 'undefined') return itemA.id === itemB.id;else return itemA === itemB;
|
|
@@ -523,9 +526,9 @@ function Panel({
|
|
|
523
526
|
prevOpenRef.current = open;
|
|
524
527
|
}
|
|
525
528
|
}, [open, resetSort]);
|
|
526
|
-
const focusTrapSettings = {
|
|
529
|
+
const focusTrapSettings = useMemo(() => ({
|
|
527
530
|
initialFocusRef: inputRef || undefined
|
|
528
|
-
};
|
|
531
|
+
}), [inputRef]);
|
|
529
532
|
const extendedTextInputProps = useMemo(() => {
|
|
530
533
|
return {
|
|
531
534
|
className: classes.TextInput,
|
|
@@ -601,9 +604,11 @@ function Panel({
|
|
|
601
604
|
regular: 'anchored',
|
|
602
605
|
narrow: 'fullscreen'
|
|
603
606
|
} : undefined, 'anchored');
|
|
604
|
-
const preventBubbling =
|
|
607
|
+
const preventBubbling = useCallback(event => {
|
|
608
|
+
var _overlayProps$onKeyDo;
|
|
609
|
+
overlayProps === null || overlayProps === void 0 ? void 0 : (_overlayProps$onKeyDo = overlayProps.onKeyDown) === null || _overlayProps$onKeyDo === void 0 ? void 0 : _overlayProps$onKeyDo.call(overlayProps, event);
|
|
610
|
+
|
|
605
611
|
// skip if a TextInput has focus
|
|
606
|
-
customOnKeyDown === null || customOnKeyDown === void 0 ? void 0 : customOnKeyDown(event);
|
|
607
612
|
const activeElement = document.activeElement;
|
|
608
613
|
if (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA') return;
|
|
609
614
|
|
|
@@ -618,7 +623,25 @@ function Panel({
|
|
|
618
623
|
|
|
619
624
|
// if this is a typeahead event, don't propagate outside of menu
|
|
620
625
|
event.stopPropagation();
|
|
621
|
-
};
|
|
626
|
+
}, [overlayProps]);
|
|
627
|
+
const mergedOverlayProps = useMemo(() => ({
|
|
628
|
+
role: 'dialog',
|
|
629
|
+
'aria-labelledby': titleId,
|
|
630
|
+
'aria-describedby': subtitle ? subtitleId : undefined,
|
|
631
|
+
...overlayProps,
|
|
632
|
+
...(variant === 'modal' ? {
|
|
633
|
+
top: '50vh',
|
|
634
|
+
left: '50vw',
|
|
635
|
+
anchorSide: undefined
|
|
636
|
+
} : {}),
|
|
637
|
+
style: {
|
|
638
|
+
transform: variant === 'modal' ? 'translate(-50%, -50%)' : undefined,
|
|
639
|
+
...(isKeyboardVisible ? {
|
|
640
|
+
maxHeight: availablePanelHeight !== undefined ? `${availablePanelHeight}px` : 'auto'
|
|
641
|
+
} : {})
|
|
642
|
+
},
|
|
643
|
+
onKeyDown: preventBubbling
|
|
644
|
+
}), [titleId, subtitle, subtitleId, overlayProps, variant, isKeyboardVisible, availablePanelHeight, preventBubbling]);
|
|
622
645
|
return /*#__PURE__*/jsxs(Fragment, {
|
|
623
646
|
children: [/*#__PURE__*/jsx(AnchoredOverlay, {
|
|
624
647
|
renderAnchor: renderMenuAnchor,
|
|
@@ -627,27 +650,7 @@ function Panel({
|
|
|
627
650
|
open: open,
|
|
628
651
|
onOpen: onOpen,
|
|
629
652
|
onClose: onClose,
|
|
630
|
-
overlayProps:
|
|
631
|
-
role: 'dialog',
|
|
632
|
-
'aria-labelledby': titleId,
|
|
633
|
-
'aria-describedby': subtitle ? subtitleId : undefined,
|
|
634
|
-
...overlayProps,
|
|
635
|
-
...(variant === 'modal' ? {
|
|
636
|
-
/* override AnchoredOverlay position */
|
|
637
|
-
top: '50vh',
|
|
638
|
-
left: '50vw',
|
|
639
|
-
anchorSide: undefined
|
|
640
|
-
} : {}),
|
|
641
|
-
style: {
|
|
642
|
-
/* override AnchoredOverlay position */
|
|
643
|
-
transform: variant === 'modal' ? 'translate(-50%, -50%)' : undefined,
|
|
644
|
-
// set maxHeight based on calculated availablePanelHeight when keyboard is visible
|
|
645
|
-
...(isKeyboardVisible ? {
|
|
646
|
-
maxHeight: availablePanelHeight !== undefined ? `${availablePanelHeight}px` : 'auto'
|
|
647
|
-
} : {})
|
|
648
|
-
},
|
|
649
|
-
onKeyDown: preventBubbling(overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.onKeyDown)
|
|
650
|
-
},
|
|
653
|
+
overlayProps: mergedOverlayProps,
|
|
651
654
|
focusTrapSettings: focusTrapSettings,
|
|
652
655
|
focusZoneSettings: focusZoneSettings,
|
|
653
656
|
height: height,
|
|
@@ -660,9 +663,7 @@ function Panel({
|
|
|
660
663
|
pinPosition: !height,
|
|
661
664
|
className: classes.Overlay,
|
|
662
665
|
displayCloseButton: showXCloseIcon,
|
|
663
|
-
closeButtonProps:
|
|
664
|
-
'aria-label': 'Cancel and close'
|
|
665
|
-
},
|
|
666
|
+
closeButtonProps: closeButtonProps,
|
|
666
667
|
children: /*#__PURE__*/jsxs("div", {
|
|
667
668
|
className: classes.Wrapper,
|
|
668
669
|
"data-variant": variant,
|
package/package.json
CHANGED