@pingux/astro 2.67.0 → 2.68.0-alpha.0

package/lib/cjs/hooks/useSelectField/useSelectField.d.ts

@@ -1,11 +1,12 @@
 import React, { DOMAttributes, Key } from 'react';
 import { AriaButtonProps } from 'react-aria';
-import { SelectState } from 'react-stately';
+import { AriaSelectOptions } from '@react-aria/select';
+import { SelectState } from '@react-stately/select';
 import type { CollectionChildren } from '@react-types/shared';
 import { LabelProps as ThemeUILabelProps } from 'theme-ui';
 import { Axis, BoxProps, FocusableElement, LabelModeProps, ListBoxProps, PlacementAxis, ReactRef, StyleProps } from '../../types';
 import { FieldControlInputProps } from '../useField/useField';
-interface UseSelectFieldProps<T> {
+interface UseSelectFieldProps<T> extends AriaSelectOptions<T> {
     children: CollectionChildren<T>;
     align?: PlacementAxis;
     defaultSelectedKey?: string;
@@ -36,7 +37,7 @@ interface UseSelectFieldProps<T> {
     containerProps?: BoxProps;
     labelMode: LabelModeProps;
 }
-interface UseSelectFieldReturnProps {
+interface UseSelectFieldReturnProps<T> {
     columnStyleProps: StyleProps;
     fieldContainerProps: BoxProps;
     fieldControlInputProps: FieldControlInputProps;
@@ -46,10 +47,10 @@ interface UseSelectFieldReturnProps {
     listBoxRef: ReactRef;
     overlay: React.ReactNode;
     popoverRef: ReactRef;
-    state: SelectState<object>;
+    state: SelectState<T>;
     triggerProps: AriaButtonProps<'button'>;
     triggerRef: ReactRef;
     valueProps: DOMAttributes<FocusableElement>;
 }
-declare const useSelectField: <T extends object>(props: UseSelectFieldProps<T>, ref: ReactRef) => UseSelectFieldReturnProps;
+declare const useSelectField: <T extends object>(props: UseSelectFieldProps<T>, ref: ReactRef) => UseSelectFieldReturnProps<T>;
 export default useSelectField;

package/lib/cjs/hooks/useSelectField/useSelectField.js

@@ -21,8 +21,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/hel
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactAria = require("react-aria");
-var _reactStately = require("react-stately");
+var _select = require("@react-aria/select");
 var _utils = require("@react-aria/utils");
+var _select2 = require("@react-stately/select");
 var _ListBox = _interopRequireDefault(require("../../components/ListBox/ListBox"));
 var _PopoverContainer = _interopRequireDefault(require("../../components/PopoverContainer"));
 var _ScrollBox = _interopRequireDefault(require("../../components/ScrollBox"));
@@ -90,7 +91,7 @@ var useSelectField = function useSelectField(props, ref) {
     children: children
   });
   // Create state based on the incoming props
-  var state = (0, _reactStately.useSelectState)(selectProps);
+  var state = (0, _select2.useSelectState)(selectProps);
   var popoverRef = (0, _react.useRef)();
   var listBoxRef = (0, _react.useRef)();
   var triggerRef = (0, _react.useRef)();
@@ -103,11 +104,11 @@ var useSelectField = function useSelectField(props, ref) {
   });
 
   // Get props for child elements from useSelect
-  var _useSelect = (0, _reactAria.useSelect)(selectProps, state, triggerRef),
-    labelProps = _useSelect.labelProps,
-    triggerProps = _useSelect.triggerProps,
-    valueProps = _useSelect.valueProps,
-    menuProps = _useSelect.menuProps;
+  var _ref = (0, _select.useSelect)(selectProps, state, triggerRef),
+    labelProps = _ref.labelProps,
+    triggerProps = _ref.triggerProps,
+    valueProps = _ref.valueProps,
+    menuProps = _ref.menuProps;
 
   // The following props are being passed into multiple
   // DOM elements that leads to multiple test failures
@@ -116,6 +117,7 @@ var useSelectField = function useSelectField(props, ref) {
   delete menuProps.shouldSelectOnPressUp;
   delete menuProps.shouldFocusOnHover;
   delete menuProps.disallowEmptySelection;
+  delete menuProps.linkBehavior;
   var _useField = (0, _.useField)(_objectSpread(_objectSpread({}, props), {}, {
       placeholder: props.labelMode === _labelModes.modes.FLOAT ? '' : placeholder,
       labelProps: _objectSpread(_objectSpread({}, props.labelProps), labelProps),

package/lib/hooks/useSelectField/useSelectField.js

@@ -13,9 +13,10 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React, { useCallback, useImperativeHandle, useLayoutEffect, useRef, useState } from 'react';
-import { DismissButton, FocusScope, useOverlayPosition, useSelect } from 'react-aria';
-import { useSelectState } from 'react-stately';
+import { DismissButton, FocusScope, useOverlayPosition } from 'react-aria';
+import { useSelect } from '@react-aria/select';
 import { useResizeObserver } from '@react-aria/utils';
+import { useSelectState } from '@react-stately/select';
 import ListBox from '../../components/ListBox/ListBox';
 import PopoverContainer from '../../components/PopoverContainer';
 import ScrollBox from '../../components/ScrollBox';
@@ -92,11 +93,11 @@ var useSelectField = function useSelectField(props, ref) {
   });
 
   // Get props for child elements from useSelect
-  var _useSelect = useSelect(selectProps, state, triggerRef),
-    labelProps = _useSelect.labelProps,
-    triggerProps = _useSelect.triggerProps,
-    valueProps = _useSelect.valueProps,
-    menuProps = _useSelect.menuProps;
+  var _ref = useSelect(selectProps, state, triggerRef),
+    labelProps = _ref.labelProps,
+    triggerProps = _ref.triggerProps,
+    valueProps = _ref.valueProps,
+    menuProps = _ref.menuProps;
 
   // The following props are being passed into multiple
   // DOM elements that leads to multiple test failures
@@ -105,6 +106,7 @@ var useSelectField = function useSelectField(props, ref) {
   delete menuProps.shouldSelectOnPressUp;
   delete menuProps.shouldFocusOnHover;
   delete menuProps.disallowEmptySelection;
+  delete menuProps.linkBehavior;
   var _useField = useField(_objectSpread(_objectSpread({}, props), {}, {
       placeholder: props.labelMode === modes.FLOAT ? '' : placeholder,
       labelProps: _objectSpread(_objectSpread({}, props.labelProps), labelProps),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.67.0",
+  "version": "2.68.0-alpha.0",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",
@@ -66,6 +66,7 @@
     "@react-aria/live-announcer": "~3.1.1",
     "@react-aria/overlays": "^3.7.0",
     "@react-aria/progress": "^3.4.9",
+    "@react-aria/select": "^3.14.5",
     "@react-aria/selection": "~3.10.1",
     "@react-aria/table": "^3.9.0",
     "@react-aria/tabs": "^3.8.3",
@@ -81,6 +82,7 @@
     "@react-stately/layout": "^3.13.4",
     "@react-stately/list": "~3.4.1",
     "@react-stately/overlays": "^3.6.4",
+    "@react-stately/select": "^3.6.4",
     "@react-stately/selection": "^3.14.2",
     "@react-stately/table": "^3.9.0",
     "@react-stately/tabs": "^3.6.3",