@primer/components 0.0.0-202111321290 → 0.0.0-202111613539

package/lib-esm/ActionMenu2.js

@@ -1,49 +1,49 @@
 import Button from './Button';
 import React from 'react';
 import { AnchoredOverlay } from './AnchoredOverlay';
-import { useProvidedStateOrCreate } from './hooks/useProvidedStateOrCreate';
-import { useProvidedRefOrCreate } from './hooks';
+import { useProvidedRefOrCreate, useProvidedStateOrCreate } from './hooks';
 import { Divider } from './ActionList2/Divider';
-import { MenuContext as ActionListMenuContext } from './ActionList2/MenuContext';
+import { ActionListContainerContext } from './ActionList2/ActionListContainerContext';
+export const MenuContext = /*#__PURE__*/React.createContext({
+  renderAnchor: null,
+  open: false
+});
 
-const ActionMenuBase = ({
+const Menu = ({
   anchorRef: externalAnchorRef,
   open,
   onOpenChange,
-  overlayProps,
   children
 }) => {
   const [combinedOpenState, setCombinedOpenState] = useProvidedStateOrCreate(open, onOpenChange, false);
-  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
   const onOpen = React.useCallback(() => setCombinedOpenState(true), [setCombinedOpenState]);
   const onClose = React.useCallback(() => setCombinedOpenState(false), [setCombinedOpenState]);
-  let renderAnchor = null;
-  const contents = [];
-  React.Children.map(children, child => {
+  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
+  let renderAnchor = null; // 🚨 Hack for good API!
+  // we strip out Anchor from children and pass it to AnchoredOverlay to render
+  // with additional props for accessibility
+
+  const contents = React.Children.map(children, child => {
     if (child.type === MenuButton || child.type === Anchor) {
       renderAnchor = anchorProps => /*#__PURE__*/React.cloneElement(child, anchorProps);
-    } else {
-      contents.push(child);
+
+      return null;
     }
+
+    return child;
   });
-  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
-    renderAnchor: renderAnchor,
-    anchorRef: anchorRef,
-    open: combinedOpenState,
-    onOpen: onOpen,
-    onClose: onClose,
-    overlayProps: overlayProps
-  }, /*#__PURE__*/React.createElement(ActionListMenuContext.Provider, {
+  return /*#__PURE__*/React.createElement(MenuContext.Provider, {
     value: {
-      parent: 'ActionMenu',
-      listRole: 'menu',
-      itemRole: 'menuitem',
-      afterSelect: onClose
+      anchorRef,
+      renderAnchor,
+      open: combinedOpenState,
+      onOpen,
+      onClose
     }
-  }, contents));
+  }, contents);
 };
 
-ActionMenuBase.displayName = "ActionMenuBase";
+Menu.displayName = "Menu";
 const Anchor = /*#__PURE__*/React.forwardRef(({
   children,
   ...anchorProps
@@ -59,9 +59,42 @@ const MenuButton = /*#__PURE__*/React.forwardRef((props, anchorRef) => {
     ref: anchorRef
   }, /*#__PURE__*/React.createElement(Button, props));
 });
-ActionMenuBase.displayName = 'ActionMenu';
-export const ActionMenu = Object.assign(ActionMenuBase, {
+
+const Overlay = ({
+  children,
+  ...overlayProps
+}) => {
+  // we typecast anchorRef as required instead of optional
+  // because we know that we're setting it in context in Menu
+  const {
+    anchorRef,
+    renderAnchor,
+    open,
+    onOpen,
+    onClose
+  } = React.useContext(MenuContext);
+  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
+    anchorRef: anchorRef,
+    renderAnchor: renderAnchor,
+    open: open,
+    onOpen: onOpen,
+    onClose: onClose,
+    overlayProps: overlayProps
+  }, /*#__PURE__*/React.createElement(ActionListContainerContext.Provider, {
+    value: {
+      container: 'ActionMenu',
+      listRole: 'menu',
+      itemRole: 'menuitem',
+      afterSelect: onClose
+    }
+  }, children));
+};
+
+Overlay.displayName = "Overlay";
+Menu.displayName = 'ActionMenu';
+export const ActionMenu = Object.assign(Menu, {
   Button: MenuButton,
   Anchor,
+  Overlay,
   Divider
 });

package/lib-esm/Autocomplete/AutocompleteMenu.js

@@ -6,7 +6,6 @@ import { AutocompleteContext } from './AutocompleteContext';
 import { PlusIcon } from '@primer/octicons-react';
 import { uniqueId } from '../utils/uniqueId';
 import { scrollIntoViewingArea } from '../behaviors/scrollIntoViewingArea';
-import VisuallyHidden from '../_VisuallyHidden';
 
 const getDefaultSortFn = isItemSelectedFn => (itemIdA, itemIdB) => isItemSelectedFn(itemIdA) === isItemSelectedFn(itemIdB) ? 0 : isItemSelectedFn(itemIdA) ? -1 : 1;
 
@@ -165,8 +164,19 @@ function AutocompleteMenu(props) {
       setSelectedItemLength(selectedItemIds.length);
     }
   }, [selectedItemIds, setSelectedItemLength]);
-  return /*#__PURE__*/React.createElement(VisuallyHidden, {
-    isVisible: showMenu
+  return /*#__PURE__*/React.createElement(Box, {
+    sx: !showMenu ? {
+      // visually hides this label for sighted users
+      position: 'absolute',
+      width: '1px',
+      height: '1px',
+      padding: '0',
+      margin: '-1px',
+      overflow: 'hidden',
+      clip: 'rect(0, 0, 0, 0)',
+      whiteSpace: 'nowrap',
+      borderWidth: '0'
+    } : {}
   }, loading ? /*#__PURE__*/React.createElement(Box, {
     p: 3,
     display: "flex",

package/lib-esm/Checkbox.d.ts

@@ -25,5 +25,5 @@ export declare type CheckboxProps = {
 /**
  * An accessible, native checkbox component
  */
-declare const Checkbox: React.ForwardRefExoticComponent<Pick<CheckboxProps, "sx" | keyof React.InputHTMLAttributes<HTMLInputElement> | "validationStatus" | "indeterminate"> & React.RefAttributes<HTMLInputElement>>;
+declare const Checkbox: React.ForwardRefExoticComponent<Pick<CheckboxProps, "sx" | keyof React.InputHTMLAttributes<HTMLInputElement> | "indeterminate" | "validationStatus"> & React.RefAttributes<HTMLInputElement>>;
 export default Checkbox;

package/lib-esm/hooks/index.d.ts

@@ -9,3 +9,4 @@ export { useAnchoredPosition } from './useAnchoredPosition';
 export { useOverlay } from './useOverlay';
 export type { UseOverlaySettings } from './useOverlay';
 export { useRenderForcingRef } from './useRenderForcingRef';
+export { useProvidedStateOrCreate } from './useProvidedStateOrCreate';

package/lib-esm/hooks/index.js

@@ -4,4 +4,5 @@ export { useOnEscapePress } from './useOnEscapePress';
 export { useOpenAndCloseFocus } from './useOpenAndCloseFocus';
 export { useAnchoredPosition } from './useAnchoredPosition';
 export { useOverlay } from './useOverlay';
-export { useRenderForcingRef } from './useRenderForcingRef';
+export { useRenderForcingRef } from './useRenderForcingRef';
+export { useProvidedStateOrCreate } from './useProvidedStateOrCreate';

package/lib-esm/index.d.ts

@@ -46,7 +46,6 @@ export { default as CircleBadge } from './CircleBadge';
 export type { CircleBadgeProps, CircleBadgeIconProps } from './CircleBadge';
 export { default as CircleOcticon } from './CircleOcticon';
 export type { CircleOcticonProps } from './CircleOcticon';
-export { default as CheckboxInputField } from './CheckboxInputField';
 export { default as CounterLabel } from './CounterLabel';
 export type { CounterLabelProps } from './CounterLabel';
 export { default as Details } from './Details';
@@ -87,7 +86,6 @@ export { default as Popover } from './Popover';
 export type { PopoverProps, PopoverContentProps } from './Popover';
 export { default as ProgressBar } from './ProgressBar';
 export type { ProgressBarProps } from './ProgressBar';
-export { default as RadioInputField } from './RadioInputField';
 export { default as SelectMenu } from './SelectMenu';
 export type { SelectMenuProps, SelectMenuDividerProps, SelectMenuFilterProps, SelectMenuFooterProps, SelectMenuItemProps, SelectMenuListProps, SelectMenuModalProps, SelectMenuTabsProps, SelectMenuHeaderProps, SelectMenuTabProps, SelectMenuTabPanelProps, SelectMenuLoadingAnimationProps } from './SelectMenu';
 export { default as SideNav } from './SideNav';
@@ -104,7 +102,6 @@ export { default as TabNav } from './TabNav';
 export type { TabNavProps, TabNavLinkProps } from './TabNav';
 export { default as TextInput } from './TextInput';
 export type { TextInputProps } from './TextInput';
-export { default as TextInputField } from './TextInputField';
 export { default as TextInputWithTokens } from './TextInputWithTokens';
 export type { TextInputWithTokensProps } from './TextInputWithTokens';
 export { default as Text } from './Text';

package/lib-esm/index.js

@@ -30,7 +30,6 @@ export { NewButton } from './NewButton';
 export { default as Caret } from './Caret';
 export { default as CircleBadge } from './CircleBadge';
 export { default as CircleOcticon } from './CircleOcticon';
-export { default as CheckboxInputField } from './CheckboxInputField';
 export { default as CounterLabel } from './CounterLabel';
 export { default as Details } from './Details';
 export { default as Dialog } from './Dialog';
@@ -56,7 +55,6 @@ export { default as Popover } from './Popover';
 // export {default as Portal, registerPortalRoot} from './Portal'
 // export type {PortalProps} from './Portal'
 export { default as ProgressBar } from './ProgressBar';
-export { default as RadioInputField } from './RadioInputField';
 export { default as SelectMenu } from './SelectMenu';
 export { default as SideNav } from './SideNav';
 export { default as Spinner } from './Spinner';
@@ -65,7 +63,6 @@ export { default as StyledOcticon } from './StyledOcticon';
 export { default as SubNav } from './SubNav';
 export { default as TabNav } from './TabNav';
 export { default as TextInput } from './TextInput';
-export { default as TextInputField } from './TextInputField';
 export { default as TextInputWithTokens } from './TextInputWithTokens';
 export { default as Text } from './Text';
 export { default as Timeline } from './Timeline';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-202111321290",
+  "version": "0.0.0-202111613539",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -43,7 +43,7 @@
   "author": "GitHub, Inc.",
   "license": "MIT",
   "dependencies": {
-    "@primer/octicons-react": "16.1.1",
+    "@primer/octicons-react": "^16.1.0",
     "@primer/primitives": "7.1.1",
     "@radix-ui/react-polymorphic": "0.0.14",
     "@react-aria/ssr": "3.1.0",

package/lib/CheckboxInputField.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-declare const _default: React.FC<import("./_InputField/ToggleInputField").Props> & {
-    Input: React.FC<Omit<React.HTMLProps<HTMLInputElement>, "ref"> & {
-        ref?: React.Ref<HTMLInputElement> | undefined;
-    }>;
-    Caption: React.FC<{}>;
-    Label: React.FC<import("./_InputField/InputFieldLabel").Props>;
-    LeadingVisual: React.FC<{}>;
-};
-export default _default;

package/lib/CheckboxInputField.js

@@ -1,73 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _ = require(".");
-
-var _InputField = _interopRequireDefault(require("./_InputField/InputField"));
-
-var _slots = require("./_InputField/slots");
-
-var _ToggleInputField = _interopRequireDefault(require("./_InputField/ToggleInputField"));
-
-var _ToggleInputLeadingVisual = _interopRequireDefault(require("./_InputField/ToggleInputLeadingVisual"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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); }
-
-const Input = ({
-  id: idProp,
-  required: requiredProp,
-  disabled: disabledProp,
-  ...rest
-}) => {
-  if (idProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'id' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  if (disabledProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'disabled' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  if (requiredProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'required' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  return /*#__PURE__*/_react.default.createElement(_slots.Slot, {
-    name: "Input"
-  }, ({
-    disabled,
-    id,
-    required,
-    captionId
-  }) => /*#__PURE__*/_react.default.createElement(_.Checkbox, _extends({
-    "aria-describedby": captionId,
-    id: id,
-    required: required,
-    disabled: disabled
-  }, rest)));
-};
-
-Input.displayName = "Input";
-
-const CheckboxInputField = props => /*#__PURE__*/_react.default.createElement(_ToggleInputField.default, props);
-
-CheckboxInputField.displayName = "CheckboxInputField";
-
-var _default = Object.assign(CheckboxInputField, {
-  Input,
-  Caption: _InputField.default.Caption,
-  Label: _InputField.default.Label,
-  LeadingVisual: _ToggleInputLeadingVisual.default
-});
-
-exports.default = _default;

package/lib/RadioInputField.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-declare const _default: React.FC<import("./_InputField/ToggleInputField").Props> & {
-    Input: React.FC<React.HTMLProps<HTMLInputElement>>;
-    Caption: React.FC<{}>;
-    Label: React.FC<import("./_InputField/InputFieldLabel").Props>;
-    LeadingVisual: React.FC<{}>;
-};
-export default _default;

package/lib/RadioInputField.js

@@ -1,82 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _InputField = _interopRequireDefault(require("./_InputField/InputField"));
-
-var _slots = require("./_InputField/slots");
-
-var _ToggleInputField = _interopRequireDefault(require("./_InputField/ToggleInputField"));
-
-var _ToggleInputLeadingVisual = _interopRequireDefault(require("./_InputField/ToggleInputLeadingVisual"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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); }
-
-// TODO: use Primer's checkbox input once it's available
-// https://github.com/github/primer/issues/489
-const RadioInput = props => {
-  return /*#__PURE__*/_react.default.createElement("input", _extends({
-    type: "radio"
-  }, props));
-};
-
-RadioInput.displayName = "RadioInput";
-
-// pulling out `id`, `disabled`, and `required` because those should come from the parent TextInputField component
-const Input = ({
-  id: idProp,
-  required: requiredProp,
-  disabled: disabledProp,
-  ...rest
-}) => {
-  if (idProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'id' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  if (disabledProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'disabled' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  if (requiredProp) {
-    // eslint-disable-next-line no-console
-    console.warn("instead of passing the 'required' prop directly to <TextInputField.Input>, it should be passed to the parent component, <TextInputField>");
-  }
-
-  return /*#__PURE__*/_react.default.createElement(_slots.Slot, {
-    name: "Input"
-  }, ({
-    disabled,
-    id,
-    required,
-    captionId
-  }) => /*#__PURE__*/_react.default.createElement(RadioInput, _extends({
-    "aria-describedby": captionId,
-    id: id,
-    required: required,
-    disabled: disabled
-  }, rest)));
-};
-
-Input.displayName = "Input";
-
-const RadioInputField = props => /*#__PURE__*/_react.default.createElement(_ToggleInputField.default, props);
-
-RadioInputField.displayName = "RadioInputField";
-
-var _default = Object.assign(RadioInputField, {
-  Input,
-  Caption: _InputField.default.Caption,
-  Label: _InputField.default.Label,
-  LeadingVisual: _ToggleInputLeadingVisual.default
-});
-
-exports.default = _default;