@junyiacademy/ui-test 0.0.9 → 0.0.10

package/declarations/libs/ui/src/lib/menu-item/SelectMenuItem.d.ts

@@ -5,5 +5,5 @@ export interface SelectMenuItemProps extends MenuItemProps {
     value?: any;
     disabled?: boolean;
 }
-declare const SelectMenuItem: React.ForwardRefExoticComponent<Pick<React.PropsWithChildren<SelectMenuItemProps>, "button" | "slot" | "style" | "title" | "color" | "width" | "alignItems" | "translate" | "hidden" | "dense" | "disabled" | "classes" | "className" | "children" | "placeholder" | "value" | "innerRef" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "selected" | "ContainerComponent" | "ContainerProps" | "disableGutters" | "divider" | "focusVisibleClassName"> & React.RefAttributes<HTMLLIElement>>;
+declare const SelectMenuItem: React.ForwardRefExoticComponent<Pick<React.PropsWithChildren<SelectMenuItemProps>, "button" | "slot" | "style" | "title" | "color" | "width" | "alignItems" | "translate" | "hidden" | "dense" | "disabled" | "classes" | "className" | "children" | "value" | "onChange" | "onKeyUp" | "onKeyDown" | "onBlur" | "onFocus" | "defaultValue" | "defaultChecked" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "innerRef" | "key" | "selected" | "ContainerComponent" | "ContainerProps" | "disableGutters" | "divider" | "focusVisibleClassName"> & React.RefAttributes<HTMLLIElement>>;
 export default SelectMenuItem;

package/declarations/libs/ui/src/lib/select/OutlinedSelect.d.ts

@@ -1,6 +1,6 @@
-import React, { ChangeEvent } from 'react';
+import { ChangeEvent } from 'react';
 import { SelectProps, OutlinedInputProps } from '@material-ui/core';
-export interface OutlinedSelectProps {
+export interface OutlinedSelectProps extends SelectProps {
     color?: 'primary' | 'secondary';
     size?: 'medium' | 'small';
     width?: number | 'auto';
@@ -10,13 +10,11 @@ export interface OutlinedSelectProps {
     hasShrink?: boolean;
     placeholder: string;
     helperText?: string;
-    value?: unknown;
     disabled?: boolean;
     SelectProps?: object | Partial<SelectProps>;
     OutlinedInputProps?: Partial<OutlinedInputProps> & {
         onChange: (e: ChangeEvent<HTMLInputElement>) => void;
     };
-    children?: React.ReactNode;
 }
-declare const OutlinedSelect: ({ color, size, width, paperMaxHeight, error, hasLabel, hasShrink, placeholder, helperText, value, disabled, SelectProps, OutlinedInputProps, children, }: OutlinedSelectProps) => JSX.Element;
+declare const OutlinedSelect: ({ placeholder, SelectProps, OutlinedInputProps, children, color, size, width, paperMaxHeight, error, hasLabel, hasShrink, helperText, value, disabled, }: OutlinedSelectProps) => JSX.Element;
 export default OutlinedSelect;

package/declarations/libs/ui/src/lib/select/StandardSelect.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import { SelectProps, InputProps } from '@material-ui/core';
-export interface StandardSelectProps {
+export interface StandardSelectProps extends SelectProps {
     color?: 'primary' | 'secondary';
     size?: 'medium' | 'small';
     width?: number | 'auto';
@@ -10,10 +9,8 @@ export interface StandardSelectProps {
     placeholder: string;
     helperText?: string;
     InputProps?: object & Partial<InputProps>;
-    value?: unknown;
     disabled?: boolean;
     SelectProps?: object | Partial<SelectProps>;
-    children?: React.ReactNode;
 }
-export declare function StandardSelect({ color, size, width, paperMaxHeight, error, hasShrink, placeholder, helperText, InputProps, value, SelectProps, disabled, children, }: StandardSelectProps): JSX.Element;
+export declare function StandardSelect({ placeholder, helperText, InputProps, SelectProps, children, color, size, width, paperMaxHeight, error, hasShrink, value, disabled, }: StandardSelectProps): JSX.Element;
 export default StandardSelect;

package/dist/libs/ui/src/lib/select/OutlinedSelect.js

@@ -91,16 +91,16 @@ const StyledSelect = styles_1.styled((_a) => {
             classes: { paper: className },
         } }, props)));
 })(({ hasAdornment, paperMaxHeight }) => ({
-    '&&': {
+    '&': {
         maxHeight: paperMaxHeight,
         left: hasAdornment ? '24px !important' : '70px',
     },
 }));
-const OutlinedSelect = ({ color = 'primary', size = 'medium', width = 'auto', paperMaxHeight = 'auto', error = false, hasLabel = true, hasShrink = false, placeholder, helperText = '', value = '', disabled = false, SelectProps, OutlinedInputProps, children, }) => {
+const OutlinedSelect = ({ placeholder, SelectProps, OutlinedInputProps, children, color = 'primary', size = 'medium', width = 'auto', paperMaxHeight = 'auto', error = false, hasLabel = true, hasShrink = false, helperText = '', value = '', disabled = false, }) => {
     const hasAdornment = !!(OutlinedInputProps === null || OutlinedInputProps === void 0 ? void 0 : OutlinedInputProps.startAdornment);
     const hasHelperText = !!helperText;
     return (react_1.default.createElement(StyledFormControl, { size: size, width: width, disabled: disabled, error: error, color: color },
-        hasLabel ? (hasShrink ? (react_1.default.createElement(StyledInputLabel, { color: color, variant: 'outlined', shrink: true }, placeholder)) : (react_1.default.createElement(StyledInputLabel, { color: color, variant: 'outlined' }, placeholder))) : null,
+        hasLabel && (react_1.default.createElement(StyledInputLabel, { color: color, variant: 'outlined', shrink: hasShrink ? true : undefined }, placeholder)),
         react_1.default.createElement(StyledSelect, Object.assign({ value: value, paperMaxHeight: paperMaxHeight, hasAdornment: hasAdornment, input: react_1.default.createElement(StyledOutlinedInput, Object.assign({ color: color, label: hasLabel ? placeholder : undefined, disabled: disabled }, OutlinedInputProps)) }, SelectProps), children),
         hasHelperText && react_1.default.createElement(core_1.FormHelperText, null, helperText)));
 };

package/dist/libs/ui/src/lib/select/StandardSelect.js

@@ -56,7 +56,6 @@ const StyledSelect = styles_1.styled((_a) => {
         maxHeight: paperMaxHeight,
         left: hasAdornment ? '48px !important' : '70px',
     },
-    [`&.${classes.selectDisabled}`]: {},
 }));
 const StyledInput = styles_1.styled((_a) => {
     var { color: _color } = _a, props = tslib_1.__rest(_a, ["color"]);
@@ -78,11 +77,11 @@ const StyledInput = styles_1.styled((_a) => {
         },
     },
 }));
-function StandardSelect({ color = 'primary', size = 'medium', width = 'auto', paperMaxHeight = 'auto', error = false, hasShrink = false, placeholder, helperText, InputProps, value = '', SelectProps, disabled = false, children, }) {
+function StandardSelect({ placeholder, helperText, InputProps, SelectProps, children, color = 'primary', size = 'medium', width = 'auto', paperMaxHeight = 'auto', error = false, hasShrink = false, value = '', disabled = false, }) {
     const hasAdornment = !!(InputProps === null || InputProps === void 0 ? void 0 : InputProps.startAdornment);
     const hasHelperText = !!helperText;
     return (react_1.default.createElement(StyledFormControl, { color: color, size: size, width: width, disabled: disabled, error: error },
-        hasShrink ? (react_1.default.createElement(StyledInputLabel, { color: color, shrink: true }, placeholder)) : (react_1.default.createElement(StyledInputLabel, { color: color }, placeholder)),
+        react_1.default.createElement(StyledInputLabel, { color: color, shrink: hasShrink ? true : undefined }, placeholder),
         react_1.default.createElement(StyledSelect, Object.assign({ value: value, paperMaxHeight: paperMaxHeight, hasAdornment: hasAdornment, input: react_1.default.createElement(StyledInput, Object.assign({ color: color }, InputProps)) }, SelectProps), children),
         hasHelperText && react_1.default.createElement(core_1.FormHelperText, null, helperText)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junyiacademy/ui-test",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "junyiacademy ui library",
   "main": "./dist/libs/ui/src/index.js",
   "typings": "./declarations/libs/ui/src/index.d.ts",

package/src/lib/TopicFilter.stories.tsx

@@ -63,13 +63,15 @@ export default {
   },
 } as Meta
 
-const OutlinedSelectStory: Story<TopicFilterProps> = (args) => (
+const TopicFilterWithOutlinedSelectStory: Story<TopicFilterProps> = (args) => (
   <TopicFilter {...args} />
 )
 
-export const OutlinedSelect = OutlinedSelectStory.bind({})
+export const TopicFilterWithOutlinedSelect = TopicFilterWithOutlinedSelectStory.bind(
+  {}
+)
 
-OutlinedSelect.args = {
+TopicFilterWithOutlinedSelect.args = {
   topicTree: topicTree,
   onTopicSelected: () => {},
   isLastLayer: (selectedTopic) => {

package/src/lib/select/OutlinedSelect.stories.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { Story, Meta } from '@storybook/react'
 import { Theme, styled } from '@material-ui/core/styles'
-import { InputAdornment } from '@material-ui/core'
+import { InputAdornment, OutlinedInputProps } from '@material-ui/core'
 import { Visibility } from '@material-ui/icons'
 import OutlinedSelect, { OutlinedSelectProps } from './OutlinedSelect'
 import SelectMenuItem from '../menu-item/SelectMenuItem'
@@ -51,7 +51,7 @@ export default {
       },
       control: { type: 'number' },
     },
-    hasInputLabel: {
+    hasLabel: {
       type: { name: 'boolean', required: false },
       description: 'If true, the label is displayed.',
       table: {
@@ -157,41 +157,47 @@ const StyledInputAdornment = styled(({ disabled: _disabled, ...props }) => (
   },
 }))
 
-const OutlinedSelectWithMenu = (props: OutlinedSelectProps) => {
-  return (
-    <OutlinedSelect {...props}>
-      <SelectMenuItem width={220} value='' disabled>
-        {PLACEHOLDER}
-      </SelectMenuItem>
-      <SelectMenuItem width={220} value='Test'>
-        This is a select menu item
-      </SelectMenuItem>
-      <SelectMenuItem width={220} value='Example'>
-        Example
-      </SelectMenuItem>
-    </OutlinedSelect>
-  )
+interface OutlinedSelectWithMenuProps {
+  startAdornment?: React.ReactNode
 }
 
-const ValueOnlyStory: Story<OutlinedSelectProps> = (args) => {
+const OutlinedSelectWithMenu = ({
+  startAdornment,
+  ...props
+}: OutlinedSelectProps & OutlinedSelectWithMenuProps) => {
   const [item, setItem] = useState<string>('')
 
   const handleChange = (event) => {
     setItem(event.target.value)
   }
   return (
-    <OutlinedSelectWithMenu
+    <OutlinedSelect
       OutlinedInputProps={{
         onChange: (e) => {
           handleChange(e)
         },
+        startAdornment,
       }}
       value={item}
-      {...args}
-    />
+      {...props}
+    >
+      <SelectMenuItem width={220} value='' disabled>
+        {PLACEHOLDER}
+      </SelectMenuItem>
+      <SelectMenuItem width={220} value='Test'>
+        This is a select menu item
+      </SelectMenuItem>
+      <SelectMenuItem width={220} value='Example'>
+        Example
+      </SelectMenuItem>
+    </OutlinedSelect>
   )
 }
 
+const ValueOnlyStory: Story<OutlinedSelectProps> = (args) => (
+  <OutlinedSelectWithMenu {...args} />
+)
+
 export const ValueOnly = ValueOnlyStory.bind({})
 
 ValueOnly.args = {
@@ -199,36 +205,23 @@ ValueOnly.args = {
   size: 'medium',
   width: 220,
   paperMaxHeight: 412,
-  hasInputLabel: true,
+  hasLabel: true,
   placeholder: PLACEHOLDER,
   helperText: 'test',
   disabled: false,
   SelectProps: {},
 }
 
-const WithPrefixStory: Story<OutlinedSelectProps> = (args) => {
-  const [item, setItem] = useState<string>('')
-
-  const handleChange = (event) => {
-    setItem(event.target.value)
-  }
-  return (
-    <OutlinedSelectWithMenu
-      OutlinedInputProps={{
-        onChange: (e) => {
-          handleChange(e)
-        },
-        startAdornment: (
-          <StyledInputAdornment position='start' disabled={args.disabled}>
-            <Visibility />
-          </StyledInputAdornment>
-        ),
-      }}
-      value={item}
-      {...args}
-    />
-  )
-}
+const WithPrefixStory: Story<OutlinedSelectProps> = (args) => (
+  <OutlinedSelectWithMenu
+    startAdornment={
+      <StyledInputAdornment position='start' disabled={args.disabled}>
+        <Visibility />
+      </StyledInputAdornment>
+    }
+    {...args}
+  />
+)
 
 export const WithPrefix = WithPrefixStory.bind({})
 
@@ -237,7 +230,7 @@ WithPrefix.args = {
   size: 'medium',
   width: 220,
   paperMaxHeight: 412,
-  hasInputLabel: true,
+  hasLabel: true,
   placeholder: PLACEHOLDER,
   helperText: 'test',
   disabled: false,

package/src/lib/select/OutlinedSelect.tsx

@@ -137,13 +137,13 @@ const StyledSelect = styled(
     />
   )
 )(({ hasAdornment, paperMaxHeight }: StyledSelectProps) => ({
-  '&&': {
+  '&': {
     maxHeight: paperMaxHeight,
     left: hasAdornment ? '24px !important' : '70px',
   },
 }))
 
-export interface OutlinedSelectProps {
+export interface OutlinedSelectProps extends SelectProps {
   color?: 'primary' | 'secondary'
   size?: 'medium' | 'small'
   width?: number | 'auto'
@@ -153,16 +153,18 @@ export interface OutlinedSelectProps {
   hasShrink?: boolean
   placeholder: string
   helperText?: string
-  value?: unknown
   disabled?: boolean
   SelectProps?: object | Partial<SelectProps>
   OutlinedInputProps?: Partial<OutlinedInputProps> & {
     onChange: (e: ChangeEvent<HTMLInputElement>) => void
   }
-  children?: React.ReactNode
 }
 
 const OutlinedSelect = ({
+  placeholder,
+  SelectProps,
+  OutlinedInputProps,
+  children,
   color = 'primary',
   size = 'medium',
   width = 'auto',
@@ -170,13 +172,9 @@ const OutlinedSelect = ({
   error = false,
   hasLabel = true,
   hasShrink = false,
-  placeholder,
   helperText = '',
   value = '',
   disabled = false,
-  SelectProps,
-  OutlinedInputProps,
-  children,
 }: OutlinedSelectProps) => {
   const hasAdornment = !!OutlinedInputProps?.startAdornment
   const hasHelperText = !!helperText
@@ -188,17 +186,15 @@ const OutlinedSelect = ({
       error={error}
       color={color}
     >
-      {hasLabel ? (
-        hasShrink ? (
-          <StyledInputLabel color={color} variant='outlined' shrink>
-            {placeholder}
-          </StyledInputLabel>
-        ) : (
-          <StyledInputLabel color={color} variant='outlined'>
-            {placeholder}
-          </StyledInputLabel>
-        )
-      ) : null}
+      {hasLabel && (
+        <StyledInputLabel
+          color={color}
+          variant='outlined'
+          shrink={hasShrink ? true : undefined}
+        >
+          {placeholder}
+        </StyledInputLabel>
+      )}
       <StyledSelect
         value={value}
         paperMaxHeight={paperMaxHeight}

package/src/lib/select/StandardSelect.tsx

@@ -92,7 +92,6 @@ const StyledSelect = styled(
     maxHeight: paperMaxHeight,
     left: hasAdornment ? '48px !important' : '70px',
   },
-  [`&.${classes.selectDisabled}`]: {},
 }))
 
 interface StyledInputProps {
@@ -123,7 +122,7 @@ const StyledInput = styled(({ color: _color, ...props }) => (
   },
 }))
 
-export interface StandardSelectProps {
+export interface StandardSelectProps extends SelectProps {
   color?: 'primary' | 'secondary'
   size?: 'medium' | 'small'
   width?: number | 'auto'
@@ -133,26 +132,24 @@ export interface StandardSelectProps {
   placeholder: string
   helperText?: string
   InputProps?: object & Partial<InputProps>
-  value?: unknown
   disabled?: boolean
   SelectProps?: object | Partial<SelectProps>
-  children?: React.ReactNode
 }
 
 export function StandardSelect({
+  placeholder,
+  helperText,
+  InputProps,
+  SelectProps,
+  children,
   color = 'primary',
   size = 'medium',
   width = 'auto',
   paperMaxHeight = 'auto',
   error = false,
   hasShrink = false,
-  placeholder,
-  helperText,
-  InputProps,
   value = '',
-  SelectProps,
   disabled = false,
-  children,
 }: StandardSelectProps) {
   const hasAdornment = !!InputProps?.startAdornment
   const hasHelperText = !!helperText
@@ -164,13 +161,9 @@ export function StandardSelect({
       disabled={disabled}
       error={error}
     >
-      {hasShrink ? (
-        <StyledInputLabel color={color} shrink>
-          {placeholder}
-        </StyledInputLabel>
-      ) : (
-        <StyledInputLabel color={color}>{placeholder}</StyledInputLabel>
-      )}
+      <StyledInputLabel color={color} shrink={hasShrink ? true : undefined}>
+        {placeholder}
+      </StyledInputLabel>
       <StyledSelect
         value={value}
         paperMaxHeight={paperMaxHeight}