@instructure/ui-simple-select 8.26.2 → 8.26.4-snapshot-3

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.26.4-snapshot-3](https://github.com/instructure/instructure-ui/compare/v8.26.3...v8.26.4-snapshot-3) (2022-07-18)
+
+
+### Features
+
+* support React 18 ([0a2bf0c](https://github.com/instructure/instructure-ui/commit/0a2bf0cdd4d8bcec6e42a7ccf28a787e4a35bc40))
+
+
+
+
+
+## [8.26.3](https://github.com/instructure/instructure-ui/compare/v8.26.2...v8.26.3) (2022-07-14)
+
+### Bug Fixes
+
+- **ui-color-picker,ui-date-input,ui-date-time-input,ui-select,ui-simple-select,ui-text-input,ui-time-select:** before/after elements should inherit input color ([7daf257](https://github.com/instructure/instructure-ui/commit/7daf257a8ee491f84de2f00a56becd22636891e3))
+
 ## [8.26.2](https://github.com/instructure/instructure-ui/compare/v8.26.1...v8.26.2) (2022-07-11)
 
 **Note:** Version bump only for package @instructure/ui-simple-select

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-simple-select",
-  "version": "8.26.2",
+  "version": "8.26.4-snapshot-3",
   "description": "A component for standard select element behavior.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -24,25 +24,25 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.26.2",
-    "@instructure/shared-types": "8.26.2",
-    "@instructure/ui-form-field": "8.26.2",
-    "@instructure/ui-position": "8.26.2",
-    "@instructure/ui-prop-types": "8.26.2",
-    "@instructure/ui-react-utils": "8.26.2",
-    "@instructure/ui-select": "8.26.2",
-    "@instructure/ui-testable": "8.26.2",
+    "@instructure/console": "8.26.4-snapshot-3",
+    "@instructure/shared-types": "8.26.4-snapshot-3",
+    "@instructure/ui-form-field": "8.26.4-snapshot-3",
+    "@instructure/ui-position": "8.26.4-snapshot-3",
+    "@instructure/ui-prop-types": "8.26.4-snapshot-3",
+    "@instructure/ui-react-utils": "8.26.4-snapshot-3",
+    "@instructure/ui-select": "8.26.4-snapshot-3",
+    "@instructure/ui-testable": "8.26.4-snapshot-3",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.26.2",
-    "@instructure/ui-color-utils": "8.26.2",
-    "@instructure/ui-icons": "8.26.2",
-    "@instructure/ui-test-locator": "8.26.2",
-    "@instructure/ui-test-utils": "8.26.2"
+    "@instructure/ui-babel-preset": "8.26.4-snapshot-3",
+    "@instructure/ui-color-utils": "8.26.4-snapshot-3",
+    "@instructure/ui-icons": "8.26.4-snapshot-3",
+    "@instructure/ui-test-locator": "8.26.4-snapshot-3",
+    "@instructure/ui-test-utils": "8.26.4-snapshot-3"
   },
   "peerDependencies": {
-    "react": ">=16.8 <=17"
+    "react": ">=16.8 <=18"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleSelect/Option/props.ts

@@ -29,18 +29,17 @@ import type {
   OtherHTMLAttributes,
   PropValidators
 } from '@instructure/shared-types'
+import { Renderable } from '@instructure/shared-types'
 
 type OptionProps = {
   id: SimpleSelectOptionOwnProps['id']
-  isDisabled: SimpleSelectOptionOwnProps['isDisabled']
-  isSelected: boolean
-  isHighlighted: boolean
-  children: SimpleSelectOptionOwnProps['children']
+  isDisabled?: SimpleSelectOptionOwnProps['isDisabled']
+  isSelected?: boolean
+  isHighlighted?: boolean
+  children?: React.ReactNode
 }
 
-type RenderSimpleSelectOptionLabel =
-  | React.ReactNode
-  | ((args: OptionProps) => React.ReactNode)
+type RenderSimpleSelectOptionLabel = Renderable<OptionProps>
 
 type SimpleSelectOptionOwnProps = {
   /**

package/src/SimpleSelect/index.tsx

@@ -345,7 +345,7 @@ class SimpleSelect extends Component<SimpleSelectProps, SimpleSelectState> {
     const getRenderLabel = (renderLabel: RenderSimpleSelectOptionLabel) => {
       return typeof renderLabel === 'function' &&
         !renderLabel?.prototype?.isReactComponent
-        ? renderLabel.bind(null, {
+        ? (renderLabel as any).bind(null, {
             id,
             isDisabled,
             isSelected,

package/src/SimpleSelect/props.ts

@@ -45,6 +45,7 @@ import type {
 } from '@instructure/ui-position'
 import type { SelectOwnProps } from '@instructure/ui-select'
 import type { WithDeterministicIdProps } from '@instructure/ui-react-utils'
+import { Renderable } from '@instructure/shared-types'
 
 type SimpleSelectOwnProps = PropsPassedToSelect & {
   /**
@@ -84,7 +85,7 @@ type SimpleSelectOwnProps = PropsPassedToSelect & {
   /**
    * Content to display in the list when no options are available.
    */
-  renderEmptyOption?: React.ReactNode | (() => React.ReactNode)
+  renderEmptyOption?: Renderable
 
   /**
    * Children of type `<SimpleSelect.Option />` or `<SimpleSelect.Group />`.
@@ -96,7 +97,7 @@ type PropsPassedToSelect = {
   /**
    * The form field label.
    */
-  renderLabel: React.ReactNode | (() => React.ReactNode)
+  renderLabel: Renderable
 
   /**
    * The id of the text input. One is generated if not supplied.
@@ -200,13 +201,13 @@ type PropsPassedToSelect = {
   /**
    * Content to display before the text input. This will commonly be an icon.
    */
-  renderBeforeInput?: React.ReactNode | (() => React.ReactNode)
+  renderBeforeInput?: Renderable
 
   /**
    * Content to display after the text input. This content will replace the
    * default arrow icons.
    */
-  renderAfterInput?: React.ReactNode | (() => React.ReactNode)
+  renderAfterInput?: Renderable
 
   /**
    * Callback fired when text input receives focus.
@@ -238,7 +239,8 @@ type SimpleSelectProps = PickPropsWithExceptions<
   OtherHTMLAttributes<
     SimpleSelectOwnProps,
     InputHTMLAttributes<SimpleSelectOwnProps>
-  > & WithDeterministicIdProps
+  > &
+  WithDeterministicIdProps
 
 type SimpleSelectState = {
   inputValue?: string