@telus-uds/components-base 0.0.2-prerelease.7 → 1.0.1

package/lib/utils/useHash.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+const doAction = (action, event) => {
+  var _window, _window$location;
+
+  return typeof action === 'function' && action((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hash, event);
+};
+/**
+ * @typedef {import('react').SyntheticEvent} SyntheticEvent
+ */
+
+/**
+ * Calls a function (passing it the current hash) based on the current hash state on mount,
+ * and binds it to call it again any time the hash changes.
+ *
+ * Consider using `useCallback` on the function to minimise adding and removing of event listeners.
+ *
+ * On Native, this is replaced with a harmless no-op function as there is no direct equivalent.
+ *
+ * @param {(hash: string, event?: SyntheticEvent) => void} action - a function to act on the current hash on load and when it changes
+ * @returns
+ */
+
+
+const useHash = (action, isReady = true) => {
+  const [isDone, setIsDone] = (0, _react.useState)(false); // Do the action just once when ready after component mount, from hash on page load
+
+  const isToDo = isReady && !isDone;
+  (0, _react.useEffect)(() => {
+    if (isToDo) {
+      setIsDone(true);
+      doAction(action);
+    }
+  }, [isToDo, action]); // Bind the action for each hash change; do re-bind if the function changes.
+
+  (0, _react.useEffect)(() => {
+    const handleChange = event => doAction(action, event);
+
+    window.addEventListener('hashchange', handleChange);
+    return () => window.removeEventListener('hashchange', handleChange);
+  }, [action]);
+};
+
+var _default = useHash;
+exports.default = _default;

package/lib/utils/useHash.native.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * No URL hashes on Native, so do a no-op. Remembering scenes for reloads
+ * is handled at OS level and deep links have completely different usage.
+ */
+const useHash = () => {};
+
+var _default = useHash;
+exports.default = _default;

package/lib/utils/useResponsiveProp.js

@@ -1,9 +1,17 @@
-import { viewports } from '@telus-uds/system-constants';
-import { useViewport } from '../ViewportProvider';
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.resolveResponsiveProp = void 0;
+
+var _systemConstants = require("@telus-uds/system-constants");
+
+var _ViewportProvider = require("../ViewportProvider");
 
 const hasOwn = (objectProp, key) => Object.prototype.hasOwnProperty.call(objectProp, key);
 
-const hasResponsiveProperties = objectProp => viewports.keys.some(key => hasOwn(objectProp, key));
+const hasResponsiveProperties = objectProp => _systemConstants.viewports.keys.some(key => hasOwn(objectProp, key));
 /**
  * Resolves a prop which may be a responsive object with keys for viewports.
  *
@@ -16,12 +24,12 @@ const hasResponsiveProperties = objectProp => viewports.keys.some(key => hasOwn(
  */
 
 
-export const resolveResponsiveProp = (prop, viewport, defaultValue) => {
+const resolveResponsiveProp = (prop, viewport, defaultValue) => {
   if (prop === undefined) return defaultValue;
   if (!prop || typeof prop !== 'object' || !hasResponsiveProperties(prop)) return prop;
-  const value = viewports.keys.includes(viewport) ? // If there's a current viewport, return the closest match at or below it
-  viewports.inherit(prop)[viewport] : // If no current viewport is available, default to smallest viewport
-  prop[viewports.keys.find(key => hasOwn(prop, key))];
+  const value = _systemConstants.viewports.keys.includes(viewport) ? // If there's a current viewport, return the closest match at or below it
+  _systemConstants.viewports.inherit(prop)[viewport] : // If no current viewport is available, default to smallest viewport
+  prop[_systemConstants.viewports.keys.find(key => hasOwn(prop, key))];
   return value === undefined ? defaultValue : value;
 };
 /**
@@ -39,9 +47,13 @@ export const resolveResponsiveProp = (prop, viewport, defaultValue) => {
  * @returns {*}
  */
 
+
+exports.resolveResponsiveProp = resolveResponsiveProp;
+
 const useResponsiveProp = (prop, defaultValue) => {
-  const viewport = useViewport();
+  const viewport = (0, _ViewportProvider.useViewport)();
   return resolveResponsiveProp(prop, viewport, defaultValue);
 };
 
-export default useResponsiveProp;
+var _default = useResponsiveProp;
+exports.default = _default;

package/lib/utils/useSpacingScale.js

@@ -1,6 +1,16 @@
-import { useViewport } from '../ViewportProvider';
-import { useThemeTokens } from '../ThemeProvider';
-import { resolveResponsiveProp } from './useResponsiveProp';
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _ViewportProvider = require("../ViewportProvider");
+
+var _ThemeProvider = require("../ThemeProvider");
+
+var _useResponsiveProp = require("./useResponsiveProp");
+
 /**
  * @typedef {import('@telus-uds/system-constants/viewports').Viewport} Viewport
  * @typedef {import('./propTypes.js').SpacingValue} SpacingValue
@@ -8,9 +18,8 @@ import { resolveResponsiveProp } from './useResponsiveProp';
  * @typedef {import('./propTypes.js').SpacingObject} SpacingObject
  * @typedef {import('./propTypes.js').SpacingOptions} SpacingOptions
  */
-
 const resolveSpacingOptions = space => {
-  if (!space?.options) return {};
+  if (!(space !== null && space !== void 0 && space.options)) return {};
   const {
     size,
     variant,
@@ -103,21 +112,22 @@ const resolveSpacingOptions = space => {
 const useSpacingScale = spaceValue => {
   // In future, may need to consider window height as well as width, particularly for native apps,
   // e.g. to ensure designs don't look lost on large, tall, not-so-wide portrait screens.
-  const viewport = useViewport();
+  const viewport = (0, _ViewportProvider.useViewport)();
   const {
     tokens,
     variant,
     overridden,
     subtract = 0
   } = resolveSpacingOptions(spaceValue);
-  const space = !overridden && (spaceValue?.space ?? resolveResponsiveProp(spaceValue, viewport, 0));
+  const space = !overridden && ((spaceValue === null || spaceValue === void 0 ? void 0 : spaceValue.space) ?? (0, _useResponsiveProp.resolveResponsiveProp)(spaceValue, viewport, 0));
   const {
     size
-  } = useThemeTokens('spacingScale', tokens, variant, {
+  } = (0, _ThemeProvider.useThemeTokens)('spacingScale', tokens, variant, {
     space: typeof space === 'number' ? space : 0,
     viewport
   });
   return Math.max(size - subtract, 0);
 };
 
-export default useSpacingScale;
+var _default = useSpacingScale;
+exports.default = _default;

package/lib/utils/useUniqueId.js

@@ -1,12 +1,21 @@
-import { useState } from 'react';
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
 let id = 0;
 
 function useUniqueId(prefix = '') {
-  const [uniqueId] = useState(() => {
+  const [uniqueId] = (0, _react.useState)(() => {
     id += 1;
     return `${prefix}-${id}`;
   });
   return uniqueId;
 }
 
-export default useUniqueId;
+var _default = useUniqueId;
+exports.default = _default;

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@telus-uds/components-base",
-  "version": "0.0.2-prerelease.7",
+  "version": "1.0.1",
   "description": "Base components",
   "keywords": [
     "base"
   ],
   "author": "TELUS Digital",
   "homepage": "https://github.com/telus/universal-design-system#readme",
-  "license": "ISC",
+  "license": "UNLICENSED",
   "main": "lib/index.js",
-  "module": "lib/index.js",
-  "react-native": "lib/index.js",
+  "react-native": "src/index.js",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -34,11 +33,14 @@
   "standard-engine": {
     "skip": true
   },
+  "browserslist": [
+    "extends @telus-uds/browserslist-config"
+  ],
   "peerDependencies": {
-    "react": "*",
+    "react": "^17.0.2",
     "react-dom": "*",
     "react-native": "*",
-    "react-native-web": "~0.14.13"
+    "react-native-web": "^0.17.0"
   },
   "devDependencies": {
     "@testing-library/jest-native": "^4.0.1",
@@ -47,10 +49,13 @@
     "react-test-renderer": "^16.3.2"
   },
   "dependencies": {
-    "@telus-uds/system-constants": "^0.0.2-prerelease.2",
-    "@telus-uds/system-themes": "^0.0.2-prerelease.0",
+    "airbnb-prop-types": "^2.16.0",
+    "@telus-uds/system-constants": "^1.0.0",
+    "@telus-uds/system-theme-tokens": "^1.0.0",
+    "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2",
     "prop-types": "^15.7.2",
-    "react-native-picker-select": "^8.0.4"
+    "react-native-picker-select": "^8.0.4",
+    "semver": "^7.3.5"
   }
 }

package/release-context.json

@@ -1,7 +1,7 @@
 {
-  "previousReleaseTag": "@telus-uds/components-base/v0.0.2-prerelease.6",
-  "changelog": "### [0.0.2-prerelease.7](https://github.com/telus/universal-design-system/compare/@telus-uds/components-base/v0.0.2-prerelease.6...@telus-uds/components-base/v0.0.2-prerelease.7) (2021-11-23)\n\n\n### Features\n\n* **base:** add `Radio` button ([#731](https://github.com/telus/universal-design-system/issues/731)) ([ad1613c](https://github.com/telus/universal-design-system/commit/ad1613c547fe3b0cdf1490a92267f32045356133))\n* **base:** add base `Checkbox` component ([#706](https://github.com/telus/universal-design-system/issues/706)) ([a3fa01a](https://github.com/telus/universal-design-system/commit/a3fa01ad0da342be02c15284a103c22d7b315ae9))\n* **base:** add Tags component ([#785](https://github.com/telus/universal-design-system/issues/785)) ([90bbf40](https://github.com/telus/universal-design-system/commit/90bbf4035a0bc0a8cdf319d9b366c8498c0dfb56))\n* **base:** add TextArea ([#720](https://github.com/telus/universal-design-system/issues/720)) ([b18cae3](https://github.com/telus/universal-design-system/commit/b18cae3357375019ecc4e24e78ed9a2345b26139))\n* **base:** add the Select component ([#759](https://github.com/telus/universal-design-system/issues/759)) ([9cfdf84](https://github.com/telus/universal-design-system/commit/9cfdf846b7a273dd140537b60e08f30a70c13a66))\n* **base:** adding list component ([#296](https://github.com/telus/universal-design-system/issues/296)) ([#703](https://github.com/telus/universal-design-system/issues/703)) ([50e474d](https://github.com/telus/universal-design-system/commit/50e474d3d7f1988f5971a10be8416c8ac510626f))\n* **base:** implementing base Skeleton component ([#770](https://github.com/telus/universal-design-system/issues/770)) ([1138f08](https://github.com/telus/universal-design-system/commit/1138f08885f4cf67fc0fb7273758d20cc0a989c1)), closes [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296) [#296](https://github.com/telus/universal-design-system/issues/296)\n\n\n### Bug Fixes\n\n* **base:** adjust event handlers for checkbox / radio inputs on Web ([#820](https://github.com/telus/universal-design-system/issues/820)) ([87624d2](https://github.com/telus/universal-design-system/commit/87624d29166ce85aeaf7dc1db4dc5b60ecd170a5))\n* **base:** fix button text alignment ([#794](https://github.com/telus/universal-design-system/issues/794)) ([9671087](https://github.com/telus/universal-design-system/commit/9671087477eb45b0d3c872b47f1d24cdd43a727f))\n* **base:** various visual fixes for native/app ([#797](https://github.com/telus/universal-design-system/issues/797)) ([a00ab12](https://github.com/telus/universal-design-system/commit/a00ab124c40e1ea46441270acfd64ae0f37b0a68))\n* export a11ytext [prerelease-components-base] ([#830](https://github.com/telus/universal-design-system/issues/830)) ([af627a2](https://github.com/telus/universal-design-system/commit/af627a2b4fa4cbf78983521bbb66b86ab9f87601))\n* **jest:** pick .web files in -allium-web tests ([#765](https://github.com/telus/universal-design-system/issues/765)) ([e0b1bd5](https://github.com/telus/universal-design-system/commit/e0b1bd5edcc52b916685f8c5dcd8d2901d2ecdbd))\n",
-  "releaseTag": "@telus-uds/components-base/v0.0.2-prerelease.7",
-  "newVersion": "0.0.2-prerelease.7",
+  "previousReleaseTag": "@telus-uds/components-base/v1.0.0",
+  "changelog": "### [1.0.1](https://github.com/telus/universal-design-system/compare/@telus-uds/components-base/v1.0.0...@telus-uds/components-base/v1.0.1) (2022-02-07)\n\n\n### Bug Fixes\n\n* **base:** add dataSet to FlexGrid (via viewProps) ([#1276](https://github.com/telus/universal-design-system/issues/1276)) ([dea06a1](https://github.com/telus/universal-design-system/commit/dea06a1393bd78147b0eebfde10f4d3365b518b4))\n",
+  "releaseTag": "@telus-uds/components-base/v1.0.1",
+  "newVersion": "1.0.1",
   "packageName": "@telus-uds/components-base"
 }

package/src/A11yText/index.jsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { forwardRef } from 'react'
 import { Platform, StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'
 
@@ -10,7 +10,7 @@ import { a11yProps } from '../utils/propTypes'
  * It should be used to add selectable screen-reader-only text to the main document flow,
  * as a sibling to blocks of text like paragraphs and interactive elements like buttons.
  */
-const A11yText = ({ text, heading, ...rest }) => {
+const A11yText = forwardRef(({ text, heading, ...rest }, ref) => {
   const a11y = a11yProps.select({
     // On iOS, needs `accessible` to be true to be focusable without non-a11y content.
     // On Web, `accessible` causes RNW to set attributes that may make the element be treated as a group.
@@ -21,8 +21,10 @@ const A11yText = ({ text, heading, ...rest }) => {
     accessibilityRole: heading ? 'header' : 'text',
     ...rest
   })
-  return <View style={styles.invisible} {...a11y} />
-}
+  return <View style={styles.invisible} ref={ref} {...a11y} />
+})
+
+A11yText.displayName = 'A11yText'
 
 A11yText.propTypes = {
   text: PropTypes.string.isRequired,

package/src/ActivityIndicator/{Spinner.web.jsx → Spinner.jsx}

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { forwardRef } from 'react'
 import { DURATION, MIN_EMPTY_ANGLE, MIN_STROKE_ANGLE, BEZIER, propTypes } from './shared'
 
 const SVG_RADIUS = 20
@@ -20,8 +20,9 @@ const bezierProps = {
 }
 // We're using svg rather than css here to define the animation to avoid needing to introduce css injection mechanism
 // It's possible to replicate this functionality with RNW animations, but it snags on chrome at least, see https://github.com/telus/universal-design-system/pull/477 for details.
-const Spinner = ({ size, color, thickness, label }) => (
+const Spinner = forwardRef(({ size, color, thickness, label }, ref) => (
   <svg
+    ref={ref}
     width={`${size}px`}
     height={`${size}px`}
     viewBox="0 0 48 48"
@@ -62,7 +63,8 @@ const Spinner = ({ size, color, thickness, label }) => (
       </circle>
     </g>
   </svg>
-)
+))
+Spinner.displayName = 'Spinner'
 
 Spinner.propTypes = propTypes
 

package/src/ActivityIndicator/Spinner.native.jsx

@@ -1,11 +1,11 @@
-import React from 'react'
+import React, { forwardRef } from 'react'
 import { Animated, Easing, StyleSheet, View } from 'react-native'
 import { DURATION, MIN_EMPTY_ANGLE, MIN_STROKE_ANGLE, BEZIER, propTypes } from './shared'
 
 const ea = MIN_EMPTY_ANGLE / 2
 const sa = MIN_STROKE_ANGLE / 2
 
-const Spinner = ({ size, color, thickness, label }) => {
+const Spinner = forwardRef(({ size, color, thickness, label }, ref) => {
   const { current: timer } = React.useRef(new Animated.Value(0))
 
   React.useLayoutEffect(() => {
@@ -31,6 +31,7 @@ const Spinner = ({ size, color, thickness, label }) => {
   // Credit to https://github.com/n4kz/react-native-indicators and https://github.com/callstack/react-native-paper for this
   return (
     <View
+      ref={ref}
       style={[styles.container]}
       accessible
       accessibilityLabel={label}
@@ -109,7 +110,8 @@ const Spinner = ({ size, color, thickness, label }) => {
       </Animated.View>
     </View>
   )
-}
+})
+Spinner.displayName = 'Spinner'
 
 Spinner.propTypes = propTypes
 

package/src/Box/Box.jsx

@@ -1,8 +1,17 @@
-import React from 'react'
+import React, { forwardRef } from 'react'
 import PropTypes from 'prop-types'
 import { View, ScrollView } from 'react-native'
 import { useThemeTokens } from '../ThemeProvider'
-import { a11yProps, spacingProps, variantProp, getTokensPropType, useSpacingScale } from '../utils'
+import {
+  a11yProps,
+  spacingProps,
+  variantProp,
+  getTokensPropType,
+  useSpacingScale,
+  viewProps,
+  getA11yPropsFromHtmlTag,
+  layoutTags
+} from '../utils'
 /**
  * @typedef {import('../utils/propTypes.js').SpacingValue} SpacingValue
  * @typedef {import('../utils/propTypes.js').SpacingIndex} SpacingIndex
@@ -87,63 +96,147 @@ const selectBoxStyles = (tokens) => {
  * text content is inside a scrollable box, as screens are not scrollable by default and even very
  * short text will require scrolling on small devices at the highest accessibility text scaling settings.
  */
-const Box = ({
-  space,
-  horizontal = space,
-  vertical = space,
-  top = vertical,
-  bottom = vertical,
-  left = horizontal,
-  right = horizontal,
-  children,
-  variant,
-  tokens,
-  scroll,
-  testID,
-  ...rest
-}) => {
-  const a11y = a11yProps.select(rest)
+const Box = forwardRef(
+  (
+    {
+      space,
+      horizontal = space,
+      vertical = space,
+      top = vertical,
+      bottom = vertical,
+      left = horizontal,
+      right = horizontal,
+      flex,
+      children,
+      variant,
+      tokens,
+      scroll,
+      tag,
+      accessibilityRole,
+      testID,
+      dataSet,
+      ...rest
+    },
+    ref
+  ) => {
+    const props = {
+      ...getA11yPropsFromHtmlTag(tag, accessibilityRole),
+      ...a11yProps.select(rest),
+      ...viewProps.select(rest)
+    }
 
-  const themeTokens = useThemeTokens('Box', tokens, variant)
-  const styles = {
-    paddingLeft: useSpacingScale(left),
-    paddingRight: useSpacingScale(right),
-    paddingTop: useSpacingScale(top),
-    paddingBottom: useSpacingScale(bottom),
-    ...selectBoxStyles(themeTokens)
-  }
+    const themeTokens = useThemeTokens('Box', tokens, variant)
+    const styles = {
+      flex,
+      paddingLeft: useSpacingScale(left),
+      paddingRight: useSpacingScale(right),
+      paddingTop: useSpacingScale(top),
+      paddingBottom: useSpacingScale(bottom),
+      ...selectBoxStyles(themeTokens)
+    }
 
-  if (scroll) {
-    const scrollProps = typeof scroll === 'object' ? scroll : {}
-    scrollProps.contentContainerStyle = [styles, scrollProps.contentContainerStyle]
+    if (scroll) {
+      const scrollProps = typeof scroll === 'object' ? scroll : {}
+      scrollProps.contentContainerStyle = [styles, scrollProps.contentContainerStyle]
+      return (
+        <ScrollView {...scrollProps} {...props} testID={testID} dataSet={dataSet} ref={ref}>
+          {children}
+        </ScrollView>
+      )
+    }
     return (
-      <ScrollView {...scrollProps} {...a11y} testID={testID}>
+      <View {...props} style={styles} testID={testID} dataSet={dataSet} ref={ref}>
         {children}
-      </ScrollView>
+      </View>
     )
   }
-  return (
-    <View {...a11y} style={styles} testID={testID}>
-      {children}
-    </View>
-  )
-}
+)
+Box.displayName = 'Box'
 
 Box.propTypes = {
+  ...a11yProps.propTypes,
+  ...viewProps.types,
+  variant: variantProp.propType,
+  tokens: getTokensPropType('Box'),
+  /**
+   * Sets default padding on all sides of the box using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   space: spacingProps.types.spacingValue,
+  /**
+   * Sets top and bottom padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   vertical: spacingProps.types.spacingValue,
+  /**
+   * Sets left and right padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   horizontal: spacingProps.types.spacingValue,
+  /**
+   * Sets bottom padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   bottom: spacingProps.types.spacingValue,
+  /**
+   * Sets left padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   left: spacingProps.types.spacingValue,
+  /**
+   * Sets right padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   right: spacingProps.types.spacingValue,
+  /**
+   * Sets top padding using the theme's spacing scale.
+   *
+   * @see {@link SpacingValue}
+   */
   top: spacingProps.types.spacingValue,
+  /**
+   * Sets the `flex` style, which controls `flexGrow`, `flexShrink` and `flexBasis` styles.
+   *
+   * Set as 1 for the box to stretch and grow to fit in the available space, or another number to share
+   * space disproportionately with siblings. See https://reactnative.dev/docs/flexbox#flex for details.
+   *
+   * With the default `0`, the box takes its minimum width from its content.
+   */
+  flex: PropTypes.number,
+  /**
+   * Renders a scrollable ScrollView instead of an unscrollable View.
+   *
+   * May take an object of ScrollView props which are passed to the rendered ScrollView.
+   */
   scroll: PropTypes.oneOfType([
     PropTypes.bool,
     ScrollView.propTypes ? PropTypes.shape(ScrollView.propTypes) : PropTypes.object
   ]),
-  variant: variantProp.propType,
-  tokens: getTokensPropType('Box'),
+  /**
+   * Optional semantic HTML tag, to apply to the container on web. Does not change styling.
+   *
+   * In native apps, if a header tag is provided ("h1", "h2" etc) and accessibilityRole prop
+   * is not defined, the accessibilityRole will default to "heading".
+   */
+  tag: PropTypes.oneOf(layoutTags),
+  /**
+   * Use in tests if the box itself needs to be targetted and no other way of selecting the
+   * box is available (e.g. it cannot be targetted using an appropriate `accessibilityRole`).
+   */
   testID: PropTypes.string,
+  /**
+   * @ignore
+   */
+  dataSet: PropTypes.object,
+  /**
+   * Box accepts any content as children.
+   */
   children: PropTypes.node.isRequired
 }
 

package/src/Button/Button.jsx

@@ -1,18 +1,22 @@
-import React from 'react'
+import React, { forwardRef } from 'react'
 
 import ButtonBase from './ButtonBase'
-import buttonPropTypes from './propTypes'
+import buttonPropTypes, { textAndA11yText } from './propTypes'
 import { useThemeTokensCallback } from '../ThemeProvider'
 import { a11yProps } from '../utils/propTypes'
 
-const Button = ({ accessibilityRole = 'button', tokens, variant, ...props }) => {
+const Button = forwardRef(({ accessibilityRole = 'button', tokens, variant, ...props }, ref) => {
   const getTokens = useThemeTokensCallback('Button', tokens, variant)
-  return <ButtonBase {...props} tokens={getTokens} accessibilityRole={accessibilityRole} />
-}
+  return (
+    <ButtonBase {...props} tokens={getTokens} accessibilityRole={accessibilityRole} ref={ref} />
+  )
+})
+Button.displayName = 'Button'
 
 Button.propTypes = {
   ...a11yProps.types,
-  ...buttonPropTypes
+  ...buttonPropTypes,
+  children: textAndA11yText
 }
 
 export default Button