@opentrons/components 0.1.6-alpha.2 → 0.1.6-alpha.20

package/src/hardware-sim/index.ts

@@ -0,0 +1,11 @@
+export * from './BaseDeck'
+export * from './BaseDeck/__fixtures__'
+export * from './ProtocolDeck'
+export * from './ProtocolDeck/utils'
+export * from './Deck'
+export * from './DeckConfigurator'
+export * from './DeckSlotLocation'
+export * from './Labware'
+export * from './Module'
+export * from './Pipette'
+export * from './RobotCoordinateSpace'

package/src/hardware-sim/utils.ts

@@ -0,0 +1,18 @@
+import type { AffineTransformMatrix } from '@opentrons/shared-data'
+
+export const IDENTITY_AFFINE_TRANSFORM: AffineTransformMatrix = [
+  [1, 0, 0, 0],
+  [0, 1, 0, 0],
+  [0, 0, 1, 0],
+  [0, 0, 0, 1],
+]
+
+// multiply two matrices together (dot product)
+export function multiplyMatrices(a: number[][], b: number[][]): number[][] {
+  const transposedB = b[0].map((_val, index) => b.map(row => row[index]))
+  return a.map(rowA =>
+    transposedB.map(rowB =>
+      rowA.reduce((acc, valA, colIndexA) => acc + valA * rowB[colIndexA], 0)
+    )
+  )
+}

package/src/helix-design-system/borders.ts

@@ -0,0 +1,32 @@
+import { COLORS } from '.'
+
+/**
+ * Constants
+ */
+export const borderRadius2 = '2px' // WEB ONLY!
+export const borderRadius4 = '4px'
+export const borderRadius8 = '8px'
+export const borderRadius12 = '12px'
+export const borderRadius16 = '16px'
+export const borderRadius40 = '40px'
+export const borderRadiusFull = '200px'
+
+/**
+ * Styles
+ */
+export const styleSolid = 'solid'
+
+/**
+ * Special-case borders
+ */
+export const activeLineBorder = `1px ${styleSolid} ${COLORS.blue50}`
+export const lineBorder = `1px ${styleSolid} ${COLORS.grey30}`
+
+/**
+ * Shadows
+ */
+export const smallDropShadow = '0px 3px 6px rgba(0, 0, 0, 0.23)'
+export const tinyDropShadow = '0px 1px 3px 0px rgba(0, 0, 0, .33)'
+// touch screen
+export const shadowBig = '0px 3px 6px rgba(0,0,0,0.23)'
+export const shadowSmall = '0px 0px 40px rgba(0,0,0,0.4)'

package/src/helix-design-system/colors.ts

@@ -0,0 +1,100 @@
+// some colors are slightly adjusted for on-device display screen differences
+// isTouchscreen hex values are dev concerns only - designs will reflect the standard hex values
+import { isTouchscreen } from '../ui-style-constants/responsiveness'
+
+/**
+ * green
+ */
+export const green60 = '#03683E'
+export const green50 = isTouchscreen ? '#1CA850' : '#04AA65'
+export const green40 = isTouchscreen ? '#8EF3A8' : '#91E2C0'
+export const green35 = isTouchscreen ? '#8AFBAB' : '#AFEDD3'
+export const green30 = '#C4F6E0'
+export const green20 = '#E8F7ED'
+
+/**
+ * red
+ */
+export const red60 = '#941313'
+export const red55 = '#C71A1B'
+export const red50 = '#DE1B1B'
+export const red40 = '#F5B2B3'
+export const red35 = '#F8C8C9'
+export const red30 = '#FAD6D6'
+export const red20 = '#FCE9E9'
+
+/**
+ * yellow
+ */
+export const yellow60 = '#825512'
+export const yellow50 = '#F09D20'
+export const yellow40 = '#FCD48B'
+export const yellow35 = '#FFE1A4'
+export const yellow30 = '#FFE9BE'
+export const yellow20 = '#FDF3E2'
+
+/**
+ * purple
+ */
+export const purple60 = isTouchscreen ? '#612367' : '#562566'
+export const purple55 = isTouchscreen ? '#822E89' : '#713187'
+export const purple50 = isTouchscreen ? '#9E39A8' : '#893BA4'
+export const purple40 = isTouchscreen ? '#E2A9EA' : '#CEA4DF'
+export const purple35 = isTouchscreen ? '#ECC2F2' : '#DBBCE7'
+export const purple30 = isTouchscreen ? '#F4DEF7' : '#E6D5EC'
+export const purple20 = isTouchscreen ? '#FFF3FE' : '#F1E8F5'
+
+/**
+ * blue
+ */
+export const blue60 = '#004196'
+export const blue55 = '#0056C8'
+export const blue40 = '#A9CEFD'
+export const blue35 = '#BFDCFD'
+export const blue30 = '#D0E6FE'
+export const blue20 = '#E1EFFF'
+export const blue10 = '#F1F8FF'
+
+/**
+ * grey
+ */
+export const grey60 = '#4A4C4E'
+export const grey55 = '#626467'
+export const grey50 = '#737578'
+export const grey40 = '#B7B8B9'
+export const grey35 = '#CBCCCC'
+export const grey30 = '#DEDEDE'
+export const grey20 = '#E9E9E9'
+export const grey10 = '#F3F3F3'
+
+/**
+ * core
+ */
+export const black90 = '#16212D'
+export const black80 = '#24313F'
+export const black70 = '#39495B'
+export const white = '#FFFFFF'
+export const blue50 = '#006CFA'
+
+/**
+ * Semi-opaques
+ * */
+export const transparentWhite80 = `${white}CC`
+export const transparentWhite50 = `${white}80`
+export const transparentBlack80 = `${black90}80`
+
+/**
+ * flex
+ */
+export const flex55 = '#0297CC'
+export const flex50 = '#00BDFF'
+
+/**
+ * extras
+ */
+export const transparent = 'transparent'
+// opacity hex codes to append to 6-digit color hex codes
+export const opacity20HexCode = '33' // 20% opacity
+export const opacity40HexCode = '66' // 40% opacity
+export const opacity60HexCode = '99' // 60% opacity
+export const opacity90HexCode = 'E6' // 90% opacity

package/src/helix-design-system/index.ts

@@ -0,0 +1,4 @@
+export * as COLORS from './colors'
+export * as BORDERS from './borders'
+export * as PRODUCT from './product'
+export * as STYLE from './style'

package/src/helix-design-system/product/index.ts

@@ -0,0 +1 @@
+export * as TYPOGRAPHY from './typography'

package/src/helix-design-system/product/typography.ts

@@ -0,0 +1,151 @@
+/**
+ * Note: these values are only currently correct for desktop and should not be used on ODD.
+ */
+
+// Valid for most typography styles
+export const fontFamily = 'Public Sans'
+
+export const fontWeightRegular = '400'
+export const fontWeightSemiBold = '600'
+export const fontWeightBold = '700'
+
+// Display styles
+const fontFamilyDisplay = fontFamily
+const fontSizeDisplay = '2.4375rem' // 39px
+const lineHeightDisplay = '3rem' // 48px
+
+// Display-Bold
+export const fontSizeDisplayBold = fontSizeDisplay
+export const lineHeightDisplayBold = lineHeightDisplay
+export const fontFamilyDisplayBold = fontFamilyDisplay
+export const fontWeightDisplayBold = fontWeightBold
+export const fontStyleDisplayBold = `${fontWeightDisplayBold} ${fontSizeDisplayBold}/${lineHeightDisplayBold} ${fontFamilyDisplayBold}`
+
+// Heading-Large
+const fontSizeHeadingLarge = '1.625rem' // 26px
+const lineHeightHeadingLarge = '2rem' // 32px
+const fontFamilyHeadingLarge = fontFamily
+
+// Heading-Large-Regular
+export const fontFamilyHeadingLargeRegular = fontFamilyHeadingLarge
+export const fontSizeHeadingLargeRegular = fontSizeHeadingLarge
+export const lineHeightHeadingLargeRegular = lineHeightHeadingLarge
+export const fontWeightHeadingLargeRegular = fontWeightRegular
+export const fontStyleHeadingLargeRegular = `${fontWeightHeadingLargeRegular} ${fontSizeHeadingLargeRegular}/${lineHeightHeadingLargeRegular} ${fontFamilyHeadingLargeRegular}`
+
+// Heading-Large-Bold
+export const fontFamilyHeadingLargeBold = fontFamilyHeadingLarge
+export const fontSizeHeadingLargeBold = fontSizeHeadingLarge
+export const lineHeightHeadingLargeBold = lineHeightHeadingLarge
+export const fontWeightHeadingLargeBold = fontWeightBold
+export const fontStyleHeadingLargeBold = `${fontWeightHeadingLargeBold} ${fontSizeHeadingLargeBold}/${lineHeightHeadingLargeBold} ${fontFamilyHeadingLargeBold}`
+
+// Heading-Medium
+const fontSizeHeadingMedium = '1.4375rem' // 23px
+const lineHeightHeadingMedium = '1.75rem' // 28px
+const fontFamilyHeadingMedium = fontFamily
+
+// Heading-Medium-Regular
+export const fontSizeHeadingMediumSemiBold = fontSizeHeadingMedium
+export const lineHeightHeadingMediumSemiBold = lineHeightHeadingMedium
+
+export const fontFamilyHeadingMediumSemiBold = fontFamilyHeadingMedium
+export const fontWeightHeadingMediumSemiBold = fontWeightSemiBold
+export const fontStyleHeadingMediumSemiBold = `${fontWeightHeadingMediumSemiBold} ${fontSizeHeadingMediumSemiBold}/${lineHeightHeadingMediumSemiBold} ${fontFamilyHeadingMediumSemiBold}`
+export const fontStyleHeadingMediumBold = `${fontWeightBold} ${fontSizeHeadingMedium}/${lineHeightHeadingMediumSemiBold} ${fontFamilyHeadingMediumSemiBold}`
+
+// Heading-Small
+const fontSizeHeadingSmall = '1.125rem' // 18px
+const lineHeightHeadingSmall = '1.5rem' // 24px
+const fontFamilyHeadingSmall = fontFamily
+
+// Heading-Small-Regular
+export const fontSizeHeadingSmallRegular = fontSizeHeadingSmall
+export const lineHeightHeadingSmallRegular = lineHeightHeadingSmall
+export const fontFamilyHeadingSmallRegular = fontFamilyHeadingSmall
+export const fontWeightHeadingSmallRegular = '400'
+export const fontStyleHeadingSmallRegular = `${fontWeightHeadingSmallRegular} ${fontSizeHeadingSmallRegular}/${lineHeightHeadingSmallRegular} ${fontFamilyHeadingSmallRegular}`
+
+// Heading-Small-Bold
+export const fontSizeHeadingSmallBold = fontSizeHeadingSmall
+export const lineHeightHeadingSmallBold = lineHeightHeadingSmall
+export const fontFamilyHeadingSmallBold = fontFamilyHeadingSmall
+export const fontWeightHeadingSmallBold = fontWeightBold
+export const fontStyleHeadingSmallBold = `${fontWeightHeadingSmallBold} ${fontSizeHeadingSmallBold}/${lineHeightHeadingSmallBold} ${fontFamilyHeadingSmallBold}`
+export const fontStyleHeadingSmallSemiBold = `${fontWeightSemiBold} ${fontSizeHeadingSmallBold}/${lineHeightHeadingSmallBold} ${fontFamilyHeadingSmallBold}`
+
+// Body-Large
+const fontSizeBodyLarge = '1rem' // 16px
+const lineHeightBodyLarge = '1.5rem' // 24px
+const fontFamilyBodyLarge = fontFamily
+
+// Body-Large-Medium
+export const fontSizeBodyLargeSemiBold = fontSizeBodyLarge
+export const lineHeightBodyLargeSemiBold = lineHeightBodyLarge
+export const fontFamilyBodyLargeSemiBold = fontFamilyBodyLarge
+export const fontWeightBodyLargeSemiBold = fontWeightSemiBold
+export const fontStyleBodyLargeSemiBold = `${fontWeightBodyLargeSemiBold} ${fontSizeBodyLargeSemiBold}/${lineHeightBodyLargeSemiBold} ${fontFamilyBodyLargeSemiBold}`
+
+// Body-Large-Regular
+export const fontSizeBodyLargeRegular = fontSizeBodyLarge
+export const lineHeightBodyLargeRegular = lineHeightBodyLarge
+export const fontFamilyBodyLargeRegular = fontFamilyBodyLarge
+export const fontWeightBodyLargeRegular = fontWeightRegular
+export const fontStyleBodyLargeRegular = `${fontWeightBodyLargeRegular} ${fontSizeBodyLargeRegular}/${lineHeightBodyLargeRegular} ${fontFamilyBodyLargeRegular}`
+
+// Body-Default
+const fontSizeBodyDefault = '0.875rem' // 14px
+const lineHeightBodyDefault = '1.25rem' // 20px
+const fontFamilyBodyDefault = fontFamily
+
+// Body-Default-Medium
+export const fontSizeBodyDefaultSemiBold = fontSizeBodyDefault
+export const lineHeightBodyDefaultSemiBold = lineHeightBodyDefault
+export const fontFamilyBodyDefaultSemiBold = fontFamilyBodyDefault
+export const fontWeightBodyDefaultSemiBold = fontWeightSemiBold
+export const fontStyleBodyDefaultSemiBold = `${fontWeightBodyDefaultSemiBold} ${fontSizeBodyDefaultSemiBold}/${lineHeightBodyDefaultSemiBold} ${fontFamilyBodyDefaultSemiBold}`
+
+// Body-Default-Regular
+export const fontSizeBodyDefaultRegular = fontSizeBodyDefault
+export const lineHeightBodyDefaultRegular = lineHeightBodyDefault
+export const fontFamilyBodyDefaultRegular = fontFamilyBodyDefault
+export const fontWeightBodyDefaultRegular = fontWeightRegular
+export const fontStyleBodyDefaultRegular = `${fontWeightBodyDefaultRegular} ${fontSizeBodyDefaultRegular}/${lineHeightBodyDefaultRegular} ${fontFamilyBodyDefaultRegular}`
+
+// Caption
+const fontSizeCaption = '0.8125rem' // 13px
+const lineHeightCaption = '1rem' // 16px
+const fontFamilyCaption = fontFamily
+
+// Caption-Bold
+export const fontSizeCaptionBold = fontSizeCaption
+export const lineHeightCaptionBold = lineHeightCaption
+export const fontFamilyCaptionBold = fontFamilyCaption
+export const fontWeightCaptionBold = fontWeightBold
+export const fontStyleCaptionBold = `${fontWeightCaptionBold} ${fontSizeCaptionBold}/${lineHeightCaptionBold} ${fontFamilyCaptionBold}`
+
+// Caption-Medium
+export const fontSizeCaptionSemiBold = fontSizeCaption
+export const lineHeightCaptionSemiBold = lineHeightCaption
+export const fontFamilyCaptionSemiBold = fontFamilyCaption
+export const fontWeightCaptionSemiBold = fontWeightSemiBold
+export const fontStyleCaptionSemiBold = `${fontWeightCaptionSemiBold} ${fontSizeCaptionSemiBold}/${lineHeightCaptionSemiBold} ${fontFamilyCaptionSemiBold}`
+
+// Caption-Regular
+export const fontSizeCaptionRegular = fontSizeCaption
+export const lineHeightCaptionRegular = lineHeightCaption
+export const fontFamilyCaptionRegular = fontFamilyCaption
+export const fontWeightCaptionRegular = fontWeightRegular
+export const fontStyleCaptionRegular = `${fontWeightCaptionRegular} ${fontSizeCaptionRegular}/${lineHeightCaptionRegular} ${fontFamilyCaptionRegular}`
+
+// Code
+const fontSizeCode = '0.8125rem' // 12px
+const lineHeightCode = '1.25rem' // 20px
+const fontFamilyCode = 'Reddit Mono'
+
+// Code-Regular
+export const fontSizeCodeRegular = fontSizeCode
+export const lineHeightCodeRegular = lineHeightCode
+export const fontFamilyCodeRegular = fontFamilyCode
+export const fontWeightCodeRegular = fontWeightRegular
+export const fontStyleCodeRegular = `${fontWeightCodeRegular} ${fontSizeCodeRegular}/${lineHeightCodeRegular} ${fontFamilyCodeRegular}`

package/src/helix-design-system/style.ts

@@ -0,0 +1,2 @@
+export const floatDropShadow =
+  'box-shadow: 0px 0px 6px 6px rgba(22, 33, 45, 0.25);'

package/src/hooks/index.ts

@@ -0,0 +1,15 @@
+// generic react hooks that don't fit cleanly anywhere else
+
+export * from './useConditionalConfirm'
+export * from './useDrag'
+export * from './useIdle'
+export * from './useInterval'
+export * from './useLongPress'
+export * from './useMountEffect'
+export * from './usePrevious'
+export * from './useScrolling'
+export * from './useSelectDeckLocation'
+export * from './useSwipe'
+export * from './useTimeout'
+export * from './useToggle'
+export * from './useMenuHandleClickOutside'

package/src/hooks/useConditionalConfirm.ts

@@ -0,0 +1,70 @@
+import { useState } from 'react'
+
+/**
+ * useConditionalConfirm is intended for cases where we want to block and defer
+ * a particular user action until the user clicks "ok" in any kind of "are you sure?"
+ * confirmation UI. The arguments passed to the confirm function will be preserved and
+ * used to call handleContinue. Ex. a click event is being deferred by a modal. When the
+ * user confirms, the initial click event passed as an argument will be used as the argument in
+ * the callback.
+ * @param {() => unknown)} handleContinue (the action we may want to require confirmation for)
+ * @param {boolean} shouldBlock (if no confirmation is needed, we will avoid the modal and immediately call handleContinue)
+ * @example
+ * ```js
+ * import { useConditionalConfirm } from '@opentrons/components'
+ *
+ * const ExampleDangerForm = props => {
+ * const {
+ *   confirm,
+ *   showConfirmation,
+ *   cancel,
+ *  } = useConditionalConfirm(props.goAhead, props.dangerIsPresent)
+ *
+ *  return (
+ *   <>
+ *     {showConfirmation && (
+ *       <AreYouSureModal
+ *         handleCancel={cancel}
+ *         handleContinue={confirm}
+ *       />
+ *     )}
+ *     <DangerFormFields />
+ *     <DangerousSubmit onClick={confirm} />
+ *   </>
+ *  )
+ * }
+ * ```
+ */
+
+export interface UseConditionalConfirmResult<T extends any[]> {
+  confirm: (...args: T) => void
+  showConfirmation: boolean
+  cancel: () => unknown
+}
+
+export const useConditionalConfirm = <T extends any[]>(
+  handleContinue: (...args: T) => any,
+  shouldBlock: boolean
+): UseConditionalConfirmResult<T> => {
+  const [pendingArgs, setPendingArgs] = useState<T | null>(null)
+  const pendingConfirm = pendingArgs !== null
+  const confirm: (...args: T) => void = (...confirmArgs) => {
+    if (shouldBlock && !pendingConfirm) {
+      setPendingArgs(confirmArgs)
+    } else {
+      // call handleContinue with pending args if we have them
+      const handleContinueArgs =
+        pendingArgs !== null ? pendingArgs : confirmArgs
+      handleContinue(...handleContinueArgs)
+      setPendingArgs(null)
+    }
+  }
+
+  return {
+    confirm,
+    showConfirmation: pendingConfirm,
+    cancel: () => {
+      setPendingArgs(null)
+    },
+  }
+}

package/src/hooks/useDrag.ts

@@ -0,0 +1,90 @@
+import { useState, useEffect, useRef } from 'react'
+import interact from 'interactjs'
+import type { CSSProperties, MutableRefObject } from 'react'
+
+export interface ElementPosition {
+  width: number
+  height: number
+  x: number
+  y: number
+}
+
+export interface UseDragResult {
+  ref: MutableRefObject<null>
+  style: CSSProperties
+  position: ElementPosition
+  isEnabled: boolean
+  enable: () => void
+  disable: () => void
+}
+
+/**
+ * useDrag makes HTMLElement draggable for on-device app
+ * This hook should be used when isOnDevice is true
+ * @param {ElementPosition} (width, height, x, and y, they are HTMLElement's size and the initial position)
+ * @returns {UseDragResult}
+ */
+
+export const useDrag = (position: ElementPosition): UseDragResult => {
+  const [elementPosition, setElementPosition] = useState<ElementPosition>(
+    position
+  )
+  const [isEnabled, setIsEnabled] = useState<boolean>(true)
+  const interactiveRef = useRef(null)
+  let { x, y, width, height } = elementPosition
+
+  const enable = (): void => {
+    if (interactiveRef?.current != null) {
+      interact((interactiveRef.current as unknown) as HTMLElement)
+        .draggable({
+          modifiers: [],
+          inertia: false,
+        })
+        .on('dragmove', (event: Interact.InteractEvent) => {
+          x += Number(event.dx)
+          y += Number(event.dy)
+
+          setElementPosition({
+            width,
+            height,
+            x,
+            y,
+          })
+        })
+    }
+  }
+  const disable = (): void => {
+    if (interactiveRef?.current != null) {
+      interact((interactiveRef.current as unknown) as HTMLElement).unset()
+    }
+  }
+
+  useEffect(() => {
+    if (isEnabled) {
+      enable()
+    } else {
+      disable()
+    }
+    return disable
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isEnabled])
+
+  return {
+    ref: interactiveRef,
+    style: {
+      transform: `translate3D(${elementPosition.x}px, ${elementPosition.y}px, 0)`,
+      width: `${elementPosition.width}px`,
+      height: `${elementPosition.height}px`,
+      position: 'absolute' as React.CSSProperties['position'],
+      touchAction: 'none',
+    },
+    position: elementPosition,
+    isEnabled,
+    enable: () => {
+      setIsEnabled(true)
+    },
+    disable: () => {
+      setIsEnabled(false)
+    },
+  }
+}

package/src/hooks/useIdle.ts

@@ -0,0 +1,68 @@
+import { useState, useEffect, useRef } from 'react'
+
+const USER_EVENTS: Array<keyof DocumentEventMap> = [
+  'click',
+  'dblclick',
+  'keypress',
+  'mousemove',
+  'pointerover',
+  'pointerenter',
+  'pointerdown',
+  'pointermove',
+  'pointerout',
+  'pointerleave',
+  'scroll',
+  'touchmove',
+  'touchstart',
+  'mousedown',
+]
+
+const DEFAULT_OPTIONS = {
+  events: USER_EVENTS,
+  initialState: true,
+}
+
+/**
+ * React hook to check user events
+ *
+ * @param {number} idleTime (idle time)
+ * @param {object} options (events that the app need to check, initialState: initial state true => idle)
+ * @returns {boolean}
+ */
+export function useIdle(
+  idleTime: number,
+  options?: Partial<{
+    events: Array<keyof DocumentEventMap>
+    initialState: boolean
+  }>
+): boolean {
+  const { events, initialState } = { ...DEFAULT_OPTIONS, ...options }
+  const [idle, setIdle] = useState<boolean>(initialState)
+  const idleTimer = useRef<number>()
+
+  useEffect(() => {
+    const handleEvents = (): void => {
+      setIdle(false)
+
+      if (idleTimer.current != null) {
+        window.clearTimeout(idleTimer.current)
+      }
+
+      idleTimer.current = window.setTimeout(() => {
+        setIdle(true)
+      }, idleTime)
+    }
+
+    events.forEach(event => {
+      document.addEventListener(event, handleEvents)
+    })
+
+    return () => {
+      events.forEach(event => {
+        document.removeEventListener(event, handleEvents)
+      })
+    }
+  }, [events, idleTime])
+
+  return idle
+}

package/src/hooks/useInterval.ts

@@ -0,0 +1,38 @@
+import { useEffect, useRef } from 'react'
+
+/**
+ * React hook to call a function on an interval; copied from:
+ * https://overreacted.io/making-setinterval-declarative-with-react-hooks/
+ *
+ * @template T (type of the input value)
+ * @param {() => unknown} callback (function to call on an interval)
+ * @param {number | null} delay (interval delay, or null to stop interval)
+ * @param {boolean} [immediate=false] (trigger the callback immediately before starting the interval)
+ * @returns {void}
+ */
+export function useInterval(
+  callback: () => unknown,
+  delay: number | null,
+  immediate: boolean = false
+): void {
+  const savedCallback: React.MutableRefObject<
+    (() => unknown) | undefined
+  > = useRef()
+
+  // remember the latest callback
+  useEffect(() => {
+    savedCallback.current = callback
+  }, [callback])
+
+  // set up the interval
+  useEffect(() => {
+    const tick = (): unknown => savedCallback.current && savedCallback.current()
+    if (delay !== null && delay > 0) {
+      if (immediate) tick()
+      const id = setInterval(tick, delay)
+      return () => {
+        clearInterval(id)
+      }
+    }
+  }, [delay, immediate])
+}