cozy-ui 111.12.0 → 111.14.0

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+# [111.14.0](https://github.com/cozy/cozy-ui/compare/v111.13.0...v111.14.0) (2024-10-03)
+
+
+### Features
+
+* **BottomSheet:** Add `hasMinHeightOffset` prop ([0e1af92](https://github.com/cozy/cozy-ui/commit/0e1af92))
+* **CozyDialogs:** Add `full` size ([d141068](https://github.com/cozy/cozy-ui/commit/d141068))
+* **CozyDialogs:** We can now propagates props to inner components ([01d9d48](https://github.com/cozy/cozy-ui/commit/01d9d48))
+* **SearchBar:** Add `auto` size and possibility to control it in the app ([038555f](https://github.com/cozy/cozy-ui/commit/038555f))
+* **SearchBar:** Add multiple props to improve component management ([13f8450](https://github.com/cozy/cozy-ui/commit/13f8450))
+
+# [111.13.0](https://github.com/cozy/cozy-ui/compare/v111.12.0...v111.13.0) (2024-09-25)
+
+
+### Bug Fixes
+
+* **AppTile:** Display the name of the developer instead custom property ([ff428f8](https://github.com/cozy/cozy-ui/commit/ff428f8))
+* **AppTile:** Show favorite label also desktop ([6477abe](https://github.com/cozy/cozy-ui/commit/6477abe))
+* **I18n:** Allow multiple locales extensions in apps by isolating state ([2bf2645](https://github.com/cozy/cozy-ui/commit/2bf2645))
+
+
+### Features
+
+* **AppSections:** Rename shortcuts section to additional apps ([3b53853](https://github.com/cozy/cozy-ui/commit/3b53853))
+
 # [111.12.0](https://github.com/cozy/cozy-ui/compare/v111.11.0...v111.12.0) (2024-09-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "111.12.0",
+  "version": "111.14.0",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/AppSections/Sections.jsx

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 
 import flag from 'cozy-flags'
-import { useExtendI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import styles from './Sections.styl'
 import * as catUtils from './categories'
@@ -16,9 +15,9 @@ import en from './locales/en.json'
 import fr from './locales/fr.json'
 import * as searchUtils from './search'
 import Typography from '../Typography'
-import withBreakpoints from '../helpers/withBreakpoints'
-import { translate } from '../providers/I18n'
-import withLocales from '../providers/I18n/withLocales'
+import { useBreakpoints } from '../providers/Breakpoints'
+import { useI18n, useExtendI18n } from '../providers/I18n'
+import withOnlyLocales from '../providers/I18n/withOnlyLocales'
 
 const locales = {
   en,
@@ -230,7 +229,10 @@ const SectionsWrapper = props => {
   const i18nConfig = generateI18nConfig(config?.categories)
   useExtendI18n(i18nConfig)
 
-  return <Sections {...props} />
+  const { t } = useI18n()
+  const breakpoints = useBreakpoints()
+
+  return <Sections {...props} breakpoints={breakpoints} t={t} />
 }
 
 Sections.propTypes = {
@@ -277,6 +279,4 @@ Sections.defaultProps = {
   })
 }
 
-export const Untranslated = withBreakpoints()(SectionsWrapper)
-
-export default withLocales(locales)(translate()(Untranslated))
+export default withOnlyLocales(locales)(SectionsWrapper)

package/react/AppSections/__snapshots__/index.spec.jsx.snap

@@ -1076,7 +1076,7 @@ exports[`AppsSection component should render dropdown filter on mobile if no nav
           "value": "partners",
         },
         Object {
-          "label": "Shortcuts",
+          "label": "Additional apps",
           "secondary": false,
           "value": "shortcuts",
         },
@@ -1482,7 +1482,7 @@ exports[`AppsSection component should render dropdown filter on tablet if no nav
           "value": "partners",
         },
         Object {
-          "label": "Shortcuts",
+          "label": "Additional apps",
           "secondary": false,
           "value": "shortcuts",
         },

package/react/AppSections/categories.spec.js

@@ -104,7 +104,7 @@ describe('generateOptionsFromApps', () => {
         type: 'webapp',
         value: 'others'
       },
-      { label: 'Shortcuts', secondary: false, value: 'shortcuts' },
+      { label: 'Additional apps', secondary: false, value: 'shortcuts' },
       {
         label: 'Services',
         secondary: false,
@@ -158,7 +158,7 @@ describe('generateOptionsFromApps', () => {
         value: 'others'
       },
       {
-        label: 'Shortcuts',
+        label: 'Additional apps',
         secondary: false,
         value: 'shortcuts'
       },

package/react/AppSections/components/__snapshots__/AppsSection.spec.jsx.snap

@@ -28,7 +28,7 @@ Array [
     "title": "Cozy Photos",
   },
   Object {
-    "developer": "By undefined",
+    "developer": null,
     "status": "Update available",
     "title": "Tasky",
   },

package/react/AppSections/locales/en.json

@@ -27,11 +27,11 @@
     "telecom": "Telecom",
     "transport": "Transportation",
     "pro": "Work",
-    "shortcuts": "Shortcuts"
+    "shortcuts": "Additional apps"
   },
   "sections": {
     "applications": "Applications",
     "konnectors": "Services",
-    "shortcuts": "Shortcuts"
+    "shortcuts": "Additional apps"
   }
 }

package/react/AppSections/locales/fr.json

@@ -27,11 +27,11 @@
     "telecom": "Mobile",
     "transport": "Voyage et transport",
     "pro": "Travail",
-    "shortcuts": "Raccourcis"
+    "shortcuts": "App supplémentaires"
   },
   "sections": {
     "applications": "Applications",
     "konnectors": "Services",
-    "shortcuts": "Raccourcis"
+    "shortcuts": "App supplémentaires"
   }
 }

package/react/AppTile/index.jsx

@@ -20,7 +20,6 @@ import Tile, {
 } from '../Tile'
 import palette from '../palette'
 import { AppDoctype } from '../proptypes'
-import useBreakpoints from '../providers/Breakpoints'
 import { createUseI18n } from '../providers/I18n'
 
 const locales = { en, fr }
@@ -52,7 +51,6 @@ export const AppTile = ({
 }) => {
   const { t } = useI18n()
   const { developer = {} } = app
-  const { isMobile } = useBreakpoints()
 
   const name = nameProp || app.name
 
@@ -61,7 +59,7 @@ export const AppTile = ({
   const isStatusArray = Array.isArray(showStatus)
 
   const statusToDisplay =
-    isShortcutFile(app) && statusLabel === APP_STATUS.installed && isMobile
+    isShortcutFile(app) && statusLabel === APP_STATUS.installed
       ? 'favorite'
       : isStatusArray
       ? showStatus.indexOf(statusLabel) > -1 && statusLabel
@@ -71,9 +69,6 @@ export const AppTile = ({
 
   const isInMaintenanceWithSpecificDisplay =
     displaySpecificMaintenanceStyle && statusLabel === APP_STATUS.maintenance
-  const tileSubtitle = isShortcutFile(app)
-    ? app.metadata?.source
-    : developer.name
 
   return (
     <Tile
@@ -109,8 +104,8 @@ export const AppTile = ({
         <TileTitle isMultiline={!statusLabel}>
           {namePrefix ? `${namePrefix} ${name}` : name}
         </TileTitle>
-        {showDeveloper && (
-          <TileSubtitle>{`${t('app_item.by')} ${tileSubtitle}`}</TileSubtitle>
+        {developer.name && showDeveloper && (
+          <TileSubtitle>{`${t('app_item.by')} ${developer.name}`}</TileSubtitle>
         )}
         {statusToDisplay && (
           <TileFooter isAccent={statusLabel === APP_STATUS.update}>

package/react/AppTile/locales/fr.json

@@ -4,6 +4,6 @@
     "installed": "Installée",
     "maintenance": "En maintenance",
     "update": "Mise à jour dispo.",
-    "favorite": "Ajouté sur la page d'accueil"
+    "favorite": "Ajouté sur l'accueil"
   }
 }

package/react/BottomSheet/BottomSheet.jsx

@@ -129,6 +129,7 @@ export const defaultBottomSheetSpringConfig = {
 const defaultSettings = {
   mediumHeightRatio: 0.75,
   mediumHeight: null,
+  hasMinHeightOffset: false,
   isOpenMin: false
 }
 
@@ -142,7 +143,7 @@ const BottomSheet = memo(
     offset,
     children
   }) => {
-    const { mediumHeightRatio, mediumHeight, isOpenMin } = {
+    const { mediumHeightRatio, mediumHeight, isOpenMin, hasMinHeightOffset } = {
       ...defaultSettings,
       ...settings
     }
@@ -244,6 +245,7 @@ const BottomSheet = memo(
         isClosable,
         isOpenMin,
         headerRef,
+        offset: hasMinHeightOffset ? offset : 0,
         actionButtonsHeight,
         actionButtonsBottomMargin
       })
@@ -418,6 +420,8 @@ BottomSheet.propTypes = {
     mediumHeight: PropTypes.number,
     /** Height of the middle snap point, expressed as a percentage of the viewport height */
     mediumHeightRatio: PropTypes.number,
+    /** To include the offset in the min height value */
+    hasMinHeightOffset: PropTypes.bool,
     /** To open the BottomSheet at the minimum height, if have an header */
     isOpenMin: PropTypes.bool
   }),

package/react/BottomSheet/README.md

@@ -46,6 +46,8 @@ import BottomSheet, { BottomSheetItem, BottomSheetTitle } from  'cozy-ui/transp
 * **settings** : `<object>` – Settings that can be modified
   * **mediumHeight** : `<number>` – Height in pixel of the middle snap point
   * **mediumHeightRatio** : `<number>` – Height of the middle snap point, expressed as a percentage of the viewport height
+  * **isOpenMin** : `<boolean>` – To open the BottomSheet at the minimum height, if have an header
+  * **hasMinHeightOffset** : `<boolean>` – To include the offset in the min height value
 * **backdrop** : `<boolean>` – To add a backdrop
 * **skipAnimation** : `<boolean>` – To remove animations
 * **offset** : `<number>` – Add an offset at the bottom

package/react/BottomSheet/helpers.js

@@ -57,6 +57,7 @@ export const computeMinHeight = ({
   isClosable,
   isOpenMin,
   headerRef,
+  offset = 0,
   actionButtonsHeight,
   actionButtonsBottomMargin
 }) => {
@@ -64,6 +65,7 @@ export const computeMinHeight = ({
 
   return (
     headerRef.current.offsetHeight +
+    offset +
     actionButtonsHeight +
     actionButtonsBottomMargin +
     (getFlagshipMetadata().navbarHeight || 0) +

package/react/BottomSheet/helpers.spec.js

@@ -152,6 +152,18 @@ describe('computeMinHeight', () => {
 
     expect(res).toBe(85)
   })
+
+  it('should return correct value with offset', () => {
+    const res = computeMinHeight({
+      isClosable: false,
+      headerRef: { current: { offsetHeight: 10 } },
+      offset: 10,
+      actionButtonsHeight: 20,
+      actionButtonsBottomMargin: 30
+    })
+
+    expect(res).toBe(95)
+  })
 })
 
 describe('setTopPosition', () => {

package/react/CozyDialogs/Readme.md

@@ -33,7 +33,7 @@ import Button from  'cozy-ui/transpiled/react/Buttons'
 
 * **componentsProps** : `<object>` – overriden properties of specific components
   * **dialogTitle** : `<object>` – DialogTitle component properties
-* **size** : `<string>` – Can be "s", "m" (default) or "l"
+* **size** : `<string>` – Can be "small", "medium" (default), "large" or "full"
 * **open** : `<boolean>` (required) – To open/close the modal
 * **disableTitleAutoPadding** : `<boolean>` (optional) – Disable title padding calculation that would prevent overlapping with close and back buttons
   * if set to `true` then you should handle those CSS properties by yourself or title will take 100% of width
@@ -205,6 +205,7 @@ const initialVariants = [{
   showActions: true,
   disableGutters: false,
   hideTitle: false,
+  fullScreen: false,
   withBackground: false
 }]
 
@@ -264,6 +265,11 @@ const initialVariants = [{
               label="Large"
               control={<Radio />}
             />
+            <FormControlLabel
+              value="full"
+              label="Full"
+              control={<Radio />}
+            />
           </RadioGroup>
         </FormControl>
         <div className="u-mt-1">
@@ -283,6 +289,7 @@ const initialVariants = [{
         {state.modalOpened && (
           <DialogComponent
             open
+            {...(variant.fullScreen && { fullScreen: true })}
             size={DialogComponent !== ConfirmDialog ? state.size : undefined}
             onClose={variant.withCloseButton ? handleClose : undefined}
             onBack={variant.withBackButton ? handleBack : undefined}

package/react/CozyDialogs/dialogPropTypes.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types'
 
 export default {
-  size: PropTypes.oneOf(['small', 'medium', 'large']),
+  size: PropTypes.oneOf(['small', 'medium', 'large', 'full']),
   open: PropTypes.bool.isRequired,
   disableTitleAutoPadding: PropTypes.bool,
   background: PropTypes.string,

package/react/CozyDialogs/useCozyDialog.js

@@ -6,7 +6,7 @@ import useBreakpoints from '../providers/Breakpoints'
 import { makeStyles } from '../styles'
 
 let globalId = 0
-const modalSizes = ['small', 'medium', 'large']
+const modalSizes = ['small', 'medium', 'large', 'full']
 
 const useStyles = makeStyles({
   paper: {
@@ -92,6 +92,7 @@ const useCozyDialog = props => {
 
   const dividerClassName = 'divider--dialog'
   const dividerProps = {
+    ...componentsProps?.divider,
     classes: {
       root: dividerClassName
     }
@@ -99,12 +100,14 @@ const useCozyDialog = props => {
 
   const dialogActionsClassName = 'cozyDialogActions'
   const dialogActionsProps = {
+    ...componentsProps?.dialogActions,
     classes: {
       root: dialogActionsClassName
     }
   }
 
   const dialogContentProps = {
+    ...componentsProps?.dialogContent,
     classes: {
       root: cx({
         disableGutters

package/react/MuiCozyTheme/overrides/makeLightNormalOverrides.js

@@ -455,6 +455,10 @@ export const makeLightNormalOverrides = theme => ({
           maxWidth: '800px'
         }
       },
+      '&.full': {
+        width: '100%',
+        maxWidth: '100%'
+      },
       '&.overflow': {
         overflowY: 'visible !important', // Allow the icon to overflow the dialog, otherwise it will be cut off,
         '& .cozyDialogContent': {

package/react/SearchBar/Readme.md

@@ -3,8 +3,15 @@ import DemoProvider from 'cozy-ui/docs/components/DemoProvider'
 import Variants from 'cozy-ui/docs/components/Variants'
 import SearchBar from 'cozy-ui/transpiled/react/SearchBar'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud'
+import FormControlLabel from 'cozy-ui/transpiled/react/FormControlLabel'
+import RadioGroup from 'cozy-ui/transpiled/react/RadioGroup'
+import Radio from 'cozy-ui/transpiled/react/Radios'
+import FormControl from 'cozy-ui/transpiled/react/FormControl'
+import FormLabel from 'cozy-ui/transpiled/react/FormLabel'
 
-const initialVariants = [{ elevation: true }]
+const initialVariants = [{ elevation: true, button: false, customIcon: false, disabledClear: false }]
+initialState = { size: 'small' }
 
 ;
 
@@ -12,10 +19,56 @@ const initialVariants = [{ elevation: true }]
   <Variants initialVariants={initialVariants} screenshotAllVariants>
     {variant => (
       <>
+         <FormControl component="fieldset">
+          <FormLabel component="legend">Size</FormLabel>
+          <RadioGroup
+            aria-label="radio"
+            name="size"
+            row
+            value={state.size}
+            onChange={event => { setState({ size: event.target.value }) }}
+          >
+            <FormControlLabel
+              value="small"
+              label="Small"
+              control={<Radio />}
+            />
+            <FormControlLabel
+              value="medium"
+              label="Medium"
+              control={<Radio />}
+            />
+            <FormControlLabel
+              value="large"
+              label="Large"
+              control={<Radio />}
+            />
+            <FormControlLabel
+              value="auto"
+              label="Auto"
+              control={<Radio />}
+            />
+          </RadioGroup>
+        </FormControl>
         <Typography className="u-mb-half">Normal</Typography>
-        <SearchBar className="u-mb-2" elevation={variant.elevation} />
+        <SearchBar className="u-mb-2"
+          elevation={variant.elevation}
+          size={state.size}
+          disabledClear={variant.disabledClear}
+          type={variant.button ? "button" : "search"}
+          icon={variant.customIcon ? CloudIcon : undefined}
+          label={variant.button ? <Typography color="primary">This is a label</Typography> : undefined}
+        />
         <Typography className="u-mb-half">Disabled</Typography>
-        <SearchBar elevation={variant.elevation} disabled />
+        <SearchBar
+          disabled
+          elevation={variant.elevation}
+          size={state.size}
+          disabledClear={variant.disabledClear}
+          type={variant.button ? "button" : "search"}
+          icon={variant.customIcon ? CloudIcon : undefined}
+          label={variant.button ? <Typography color="primary">This is a label</Typography> : undefined}
+        />
       </>
     )}
   </Variants>

package/react/SearchBar/index.jsx

@@ -3,25 +3,42 @@ import debounce from 'lodash/debounce'
 import PropTypes from 'prop-types'
 import React, { forwardRef, useState, useMemo } from 'react'
 
-import withOnlyLocales from './locales/withOnlyLocales'
+import { locales } from './locales/withOnlyLocales'
+import ButtonBase from '../ButtonBase'
 import Icon from '../Icon'
+import { iconPropType } from '../Icon'
 import IconButton from '../IconButton'
 import CrossCircleIcon from '../Icons/CrossCircle'
 import MagnifierIcon from '../Icons/Magnifier'
 import InputBase from '../InputBase'
 import Paper from '../Paper'
-import { useI18n } from '../providers/I18n'
+import Typography from '../Typography'
+import { useI18n, useExtendI18n } from '../providers/I18n'
 import { makeStyles } from '../styles'
 
+const sizeToPixel = {
+  small: 40,
+  medium: 48,
+  large: 56,
+  auto: 'auto'
+}
+
+const radiusBySize = {
+  small: 20,
+  medium: 24,
+  large: 28,
+  auto: 24
+}
+
 const useStyles = makeStyles(theme => ({
   root: {
     display: 'flex',
     boxSizing: 'border-box',
     position: 'relative',
     alignItems: 'center',
-    height: 40,
+    height: ({ size }) => sizeToPixel[size],
     flex: 1,
-    borderRadius: 99,
+    borderRadius: ({ size }) => radiusBySize[size],
     borderStyle: 'solid',
     borderWidth: 1,
     borderColor: 'transparent',
@@ -37,7 +54,19 @@ const useStyles = makeStyles(theme => ({
     backgroundColor: theme.palette.background.contrast
   },
   inputBase: {
-    flex: 1
+    flex: 1,
+    paddingLeft: ({ icon }) => !icon && '1rem'
+  },
+  buttonBase: {
+    flex: 1,
+    justifyContent: 'start',
+    height: '100%',
+    borderRadius: 99
+  },
+  typography: {
+    color: 'currentColor',
+    opacity: 0.42,
+    paddingLeft: ({ icon }) => !icon && '1rem'
   },
   icon: {
     color: theme.palette.text.secondary,
@@ -81,8 +110,15 @@ const SearchBar = forwardRef(
   (
     {
       placeholder: placeholderProp,
+      icon,
+      size,
+      type,
+      label: labelProp,
+      componentsProps,
+      disabledClear,
       className,
       defaultValue,
+      value,
       elevation,
       disabled,
       onChange,
@@ -93,23 +129,25 @@ const SearchBar = forwardRef(
     ref
   ) => {
     const { t } = useI18n()
-    const classes = useStyles()
+    const classes = useStyles({ size, type, icon })
     const [currentValue, setCurrentValue] = useState(defaultValue)
     const [isFocused, setIsFocused] = useState(false)
 
-    const placeholder = placeholderProp || t('search.placeholder')
+    const placeholder = placeholderProp || t('SearchBar.placeholder')
+    const label = labelProp || t('SearchBar.placeholder')
+    const spreadValue = value || currentValue
+    const isSelfControlledComp = typeof value === 'undefined'
 
-    const delayedOnChange = useMemo(
-      () => debounce(event => onChange(event), 375),
-      [onChange]
-    )
+    const delayedOnChange = useMemo(() => debounce(onChange, 375), [onChange])
 
     const handleChange = ev => {
-      const value = ev.target.value
+      if (!isSelfControlledComp) return onChange(ev)
 
-      if (value.length >= 1) {
+      const _value = ev.target.value
+
+      if (_value.length >= 1) {
         delayedOnChange(ev)
-        setCurrentValue(value)
+        setCurrentValue(_value)
       } else {
         handleClear(ev)
       }
@@ -143,18 +181,32 @@ const SearchBar = forwardRef(
         ref={ref}
         {...props}
       >
-        <Icon className={classes.icon} icon={MagnifierIcon} />
-        <InputBase
-          className={classes.inputBase}
-          placeholder={disabled ? null : placeholder}
-          value={disabled ? placeholder : currentValue}
-          disabled={disabled}
-          aria-label={placeholder}
-          onChange={handleChange}
-          onFocus={handleFocus}
-          onBlur={handleBlur}
-        />
-        {currentValue && (
+        {type === 'button' ? (
+          <ButtonBase className={classes.buttonBase}>
+            {icon && <Icon className={classes.icon} icon={icon} />}
+            {typeof label === 'string' ? (
+              <Typography className={classes.typography}>{label}</Typography>
+            ) : (
+              label
+            )}
+          </ButtonBase>
+        ) : (
+          <>
+            {icon && <Icon className={classes.icon} icon={icon} />}
+            <InputBase
+              {...componentsProps?.inputBase}
+              className={classes.inputBase}
+              placeholder={disabled ? null : placeholder}
+              value={disabled ? placeholder : spreadValue}
+              disabled={disabled}
+              aria-label={placeholder}
+              onChange={handleChange}
+              onFocus={handleFocus}
+              onBlur={handleBlur}
+            />
+          </>
+        )}
+        {spreadValue && !disabledClear && (
           <IconButton size="medium" onClick={handleClear}>
             <Icon icon={CrossCircleIcon} />
           </IconButton>
@@ -174,6 +226,10 @@ SearchBar.displayName = 'SearchBar'
 
 SearchBar.defaultProps = {
   elevation: true,
+  icon: MagnifierIcon,
+  size: 'small',
+  type: 'search',
+  disabledClear: false,
   defaultValue: '',
   onChange: () => {},
   onFocus: () => {},
@@ -182,13 +238,35 @@ SearchBar.defaultProps = {
 
 SearchBar.propTypes = {
   className: PropTypes.string,
+  type: PropTypes.oneOf(['button', 'search']),
+  icon: iconPropType,
+  size: PropTypes.oneOf(['small', 'medium', 'large', 'auto']),
+  componentsProps: PropTypes.shape({
+    /** Props spread to InputBase component */
+    inputBase: PropTypes.object
+  }),
+  /** Used to control the component outside of it */
+  value: PropTypes.string,
+  /** Used only with self-controlled component */
   defaultValue: PropTypes.string,
+  disabledClear: PropTypes.bool,
   elevation: PropTypes.bool,
   placeholder: PropTypes.string,
+  label: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.func,
+    PropTypes.object
+  ]),
   disabled: PropTypes.bool,
   onChange: PropTypes.func,
   onFocus: PropTypes.func,
   onBlur: PropTypes.func
 }
 
-export default withOnlyLocales(SearchBar)
+const SearchBarWithLocales = props => {
+  useExtendI18n(locales)
+
+  return <SearchBar {...props} />
+}
+
+export default SearchBarWithLocales