@licklist/design 0.70.10 → 0.71.1

package/src/assets/iframe/available.svg

@@ -1,5 +1,5 @@
-<svg width="7" height="11" viewBox="0 0 7 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.943939" y="1.03658" width="5.25188" height="3.04878" rx="1.5" fill="#4CF973" stroke="white"/>
-<rect x="0.943939" y="4.10976" width="5.25188" height="3.04878" rx="1.5" fill="#4CF973" stroke="white"/>
-<rect x="0.943939" y="7.18292" width="5.25188" height="3.04878" rx="1.5" fill="#4CF973" stroke="white"/>
+<svg  viewBox="auto" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="14%" y="0" width="63%" height="29%" rx="15%" fill="#4CF973" stroke="white"/>
+<rect x="14%" y="33%" width="63%" height="29%" rx="15%" fill="#4CF973" stroke="white"/>
+<rect x="14%" y="66%" width="63%" height="29%" rx="15%" fill="#4CF973" stroke="white"/>
 </svg>

package/src/availability-indicator/AvailabilityIndicator.tsx

@@ -1,9 +1,15 @@
 import { FunctionComponent, SVGProps } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
+import {
+  AVAILABILITY_FORMAT_NUMBER,
+  AvailabilityFormat,
+} from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
+import { useWindowDimensions } from '@licklist/plugins'
 import { ReactComponent as AvailableIcon } from '../assets/iframe/available.svg'
 import { ReactComponent as LimitedIcon } from '../assets/iframe/limited.svg'
 import { ReactComponent as SoldOutIcon } from '../assets/iframe/soldOut.svg'
+import { TAB_WIDTH } from '../iframe/page/components/PageBody/constants'
 
 const LOTS_OF_SPACE_LIMIT = 0.2
 const LIMITED_LIMIT = 0.8
@@ -13,38 +19,94 @@ type Config = {
   Icon: FunctionComponent<SVGProps<SVGSVGElement>>
 }
 
-const getIconsAndLabels = ({
+type GetIconsAndLabelsWithArgumentResult = Config & {
+  argument?: number
+}
+
+interface GetIconsAndLabels extends ZoneResourcesAvailability {
+  availabilityFormat?: AvailabilityFormat | null
+}
+interface GetAppropreateLabelFormat extends GetIconsAndLabels {
+  label?: string
+}
+
+const getLabelsWithArgument = ({
   bookedResources,
   totalResources,
-}: ZoneResourcesAvailability): Config => {
-  if (bookedResources === totalResources) {
-    return { label: 'soldOut', Icon: SoldOutIcon }
+  availabilityFormat,
+  label,
+}: GetAppropreateLabelFormat): {
+  label: string
+  argument?: number
+} => {
+  const availableResources = totalResources - bookedResources
+
+  if (availabilityFormat !== AVAILABILITY_FORMAT_NUMBER) {
+    return { label }
   }
 
+  return availableResources === 1
+    ? { label: 'availableSingleSpace' }
+    : { label: 'availableMultipleSpaces', argument: availableResources }
+}
+
+const getIconsAndLabelsWithArgument = ({
+  bookedResources,
+  totalResources,
+  availabilityFormat,
+}: GetIconsAndLabels): GetIconsAndLabelsWithArgumentResult => {
   // lots of space if less than 80% booked
   if (bookedResources / totalResources <= LOTS_OF_SPACE_LIMIT) {
-    return { label: 'lotsOfSpace', Icon: AvailableIcon }
+    return {
+      ...getLabelsWithArgument({
+        bookedResources,
+        totalResources,
+        availabilityFormat,
+        label: 'lotsOfSpace',
+      }),
+      Icon: AvailableIcon,
+    }
   }
 
   if (bookedResources / totalResources >= LIMITED_LIMIT) {
-    return { label: 'limited', Icon: LimitedIcon }
+    return {
+      ...getLabelsWithArgument({
+        bookedResources,
+        totalResources,
+        availabilityFormat,
+        label: 'limited',
+      }),
+      Icon: LimitedIcon,
+    }
   }
 
-  return { label: 'available', Icon: AvailableIcon }
+  return {
+    ...getLabelsWithArgument({
+      bookedResources,
+      totalResources,
+      availabilityFormat,
+      label: 'available',
+    }),
+    Icon: AvailableIcon,
+  }
 }
 
 type AvailabilityIndicatorProps = {
-  resources: ZoneResourcesAvailability
+  resources?: ZoneResourcesAvailability
   isUnavailable?: boolean
   isSoldOut?: boolean
+  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const AvailabilityIndicator = ({
   resources,
   isUnavailable,
-  isSoldOut,
+  isSoldOut: _isSoldOut,
+  availabilityFormat,
 }: AvailabilityIndicatorProps) => {
   const { t } = useTranslation('Design')
+  const isSoldOut =
+    _isSoldOut || resources?.bookedResources === resources?.totalResources
 
   if (isUnavailable) {
     return <Indicator Icon={SoldOutIcon} label={t('notAvailable')} />
@@ -54,14 +116,27 @@ export const AvailabilityIndicator = ({
     return <Indicator Icon={SoldOutIcon} label={t('soldOut')} />
   }
 
-  const { Icon, label } = getIconsAndLabels(resources)
+  const { Icon, label, argument } = getIconsAndLabelsWithArgument({
+    ...resources,
+    availabilityFormat,
+  })
 
-  return <Indicator Icon={Icon} label={t(label)} />
+  return (
+    <Indicator
+      Icon={Icon}
+      label={t(label, argument ? { argument } : undefined)}
+    />
+  )
 }
 
-const Indicator = ({ Icon, label }: Config) => (
-  <div className='availability-indicator'>
-    <Icon />
-    <div>{label}</div>
-  </div>
-)
+const Indicator = ({ Icon, label }: Config) => {
+  const { width } = useWindowDimensions()
+  const iconSizes =
+    width > TAB_WIDTH ? { height: 15, width: 11 } : { height: 11, width: 7 }
+  return (
+    <div className='availability-indicator'>
+      <Icon height={iconSizes.height} width={iconSizes.width} viewBox='auto' />
+      <div className='indicator-label'>{label}</div>
+    </div>
+  )
+}

package/src/calendar/Calendar.tsx

@@ -1,5 +1,6 @@
 import { Dispatch, ReactElement, SetStateAction } from 'react'
 import { DateTime } from 'luxon'
+import { AvailabilityFormat } from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
 import { DateTimeButtonProps } from 'src/date-time-button'
 import { CalendarButtons } from './components/CalendarButtons'
 import { CalendarDates } from './components/CalendarDates'
@@ -21,6 +22,7 @@ export type CalendarProps = {
   fromPrice?: string | ReactElement | null
   isLoading?: boolean
   initialDate?: DateTime
+  availabilityFormat?: AvailabilityFormat | null
   getDateTimeButtonProps: (
     date: DateTime,
   ) => Pick<DateTimeButtonProps, 'resources' | 'showResources' | 'isDisabled'>

package/src/calendar/components/CalendarDates/CalendarDates.tsx

@@ -11,6 +11,7 @@ export type CalendarDatesProps = Pick<
   | 'setSelectedDate'
   | 'fromPrice'
   | 'getDateTimeButtonProps'
+  | 'availabilityFormat'
 >
 
 export const CalendarDates = ({
@@ -18,6 +19,7 @@ export const CalendarDates = ({
   selectedDate,
   setSelectedDate,
   fromPrice,
+  availabilityFormat,
   getDateTimeButtonProps,
 }: CalendarDatesProps) => {
   const fillCalendarDates = useMemo(() => {
@@ -56,6 +58,7 @@ export const CalendarDates = ({
               onSelect={() => setSelectedDate(date)}
               price={fromPrice}
               variant={Variant.month}
+              availabilityFormat={availabilityFormat}
               {...props}
             />
           )

package/src/calendar/utils/index.ts

@@ -1,40 +1,31 @@
+import { TimeZone } from '@licklist/core/dist/DataMapper/Common/TimeZoneDataMapper'
 import { DateTime, Interval } from 'luxon'
 
-export const getMonthCalendarDates = (
-  initialDate: DateTime,
-  timeZone?: string,
-): DateTime[] => {
+type Builder = (args: {
+  initialDate?: DateTime
+  timeZone: TimeZone['name']
+}) => DateTime[]
+
+export const getMonthCalendarDates: Builder = ({
+  initialDate: _initialDate,
+  timeZone,
+}): DateTime[] => {
+  const initialDate = _initialDate || DateTime.now().setZone(timeZone)
+
   const startOfMonth = initialDate.startOf('month')
   const endOfMonth = initialDate.endOf('month')
 
-  const dateTimes = Interval.fromDateTimes(startOfMonth, endOfMonth)
+  return Interval.fromDateTimes(startOfMonth, endOfMonth)
     .splitBy({ day: 1 })
     .map((d) => d.start)
-
-  if (timeZone) {
-    return dateTimes.map((date) =>
-      date.setZone(timeZone, { keepLocalTime: true }),
-    )
-  }
-
-  return dateTimes
 }
 
-export const getWeekCalendarDates = (
-  initialDate: DateTime,
-  timeZone?: string,
-): DateTime[] => {
+export const getWeekCalendarDates: Builder = ({ timeZone }): DateTime[] => {
+  const initialDate = DateTime.now().setZone(timeZone)
+
   const lastDay = initialDate.plus({ days: 7 })
 
-  const dateTimes = Interval.fromDateTimes(initialDate, lastDay)
+  return Interval.fromDateTimes(initialDate, lastDay)
     .splitBy({ day: 1 })
     .map((d) => d.start)
-
-  if (timeZone) {
-    return dateTimes.map((date) =>
-      date.setZone(timeZone, { keepLocalTime: true }),
-    )
-  }
-
-  return dateTimes
 }

package/src/date-time-button/DateContent.tsx

@@ -6,9 +6,9 @@ import {
 } from '@licklist/core/dist/Config'
 import { getDayWithOrdinal } from '@licklist/plugins/dist/utils/formatDate'
 import clsx from 'clsx'
-import { isToday, isTomorrow } from 'date-fns'
 import { DateTime } from 'luxon'
 import { useTranslation } from 'react-i18next'
+import { isToday, isTomorrow } from '@licklist/plugins/dist'
 import { DateTimeButtonProps, Variant } from './DateTimeButton'
 
 type DateContentProps = Pick<
@@ -55,9 +55,9 @@ export const DateContent = ({
 }
 
 const getDate = (date: DateTime): string => {
-  if (isToday(date.toJSDate())) return 'today'
+  if (isToday(date)) return 'today'
 
-  if (isTomorrow(date.toJSDate())) return 'tomorrow'
+  if (isTomorrow(date)) return 'tomorrow'
 
   return date.toFormat(DAY_OF_WEEK)
 }

package/src/date-time-button/DateTimeButton.tsx

@@ -2,6 +2,7 @@ import { ReactElement } from 'react'
 import clsx from 'clsx'
 import { DateTime } from 'luxon'
 import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
+import { AvailabilityFormat } from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
 import { AvailabilityIndicator } from '../availability-indicator'
 import { DateContent } from './DateContent'
 
@@ -21,6 +22,7 @@ export type DateTimeButtonProps = {
   resources?: ZoneResourcesAvailability | null
   showResources?: boolean
   variant: Variant
+  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const DateTimeButton = ({
@@ -33,6 +35,7 @@ export const DateTimeButton = ({
   resources,
   showResources,
   variant = Variant.week,
+  availabilityFormat,
 }: DateTimeButtonProps) => {
   const isSoldOut =
     _isSoldOut ||
@@ -43,7 +46,7 @@ export const DateTimeButton = ({
   const isPast = variant === Variant.time ? isPastTime(date) : isPastDate(date)
 
   const isDisabled = _isDisabled || isSoldOut || isPast
-
+  const isUnavailable = _isDisabled || isPast
   return (
     <button
       type='button'
@@ -67,10 +70,11 @@ export const DateTimeButton = ({
         variant={variant}
       />
       {price && !isDisabled && <div className='price'>{price}</div>}
-      {showResources && resources && (
+      {showResources && (resources || isUnavailable) && (
         <AvailabilityIndicator
+          availabilityFormat={availabilityFormat}
           resources={resources}
-          isUnavailable={_isDisabled || isPast}
+          isUnavailable={isUnavailable}
           isSoldOut={isSoldOut}
         />
       )}

package/src/iframe/activity-card/ActivityCard.tsx

@@ -2,6 +2,7 @@ import { ReactNode } from 'react'
 import clsx from 'clsx'
 import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
 import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
+import { AvailabilityFormat } from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
 import { AvailabilityIndicator } from '../../availability-indicator'
 
 export const LAYOUT_GRID = 'grid'
@@ -18,6 +19,7 @@ export type ActivityCardProps = {
   availableTimes?: string | null
   image?: Image | null
   resources?: ZoneResourcesAvailability
+  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const ActivityCard = ({
@@ -30,6 +32,7 @@ export const ActivityCard = ({
   onSelect,
   isSelected,
   layout = LAYOUT_GRID,
+  availabilityFormat,
   resources,
 }: ActivityCardProps) => {
   if (layout === LAYOUT_GRID) {
@@ -50,7 +53,12 @@ export const ActivityCard = ({
           {description && (
             <div className='mt-2 activity-card-description'>{description}</div>
           )}
-          {resources && <AvailabilityIndicator resources={resources} />}
+          {resources && (
+            <AvailabilityIndicator
+              resources={resources}
+              availabilityFormat={availabilityFormat}
+            />
+          )}
         </div>
       </button>
     )
@@ -76,7 +84,12 @@ export const ActivityCard = ({
         {description && (
           <div className='mt-2 activity-card-description'>{description}</div>
         )}
-        {resources && <AvailabilityIndicator resources={resources} />}
+        {resources && (
+          <AvailabilityIndicator
+            resources={resources}
+            availabilityFormat={availabilityFormat}
+          />
+        )}
       </div>
 
       <hr className='list-activity-card-hr' />

package/src/styles/availability-indicator/AvailabilityIndicator.scss

@@ -4,6 +4,15 @@
   align-items: center;
   gap: 0.5rem;
   font-weight: 300;
+  max-width: 100%;
+
+
+  .indicator-label {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    flex-shrink: 2;
+  }
 
   @include media-breakpoint-down(sm) {
     div {

package/src/styles/date-time-button/DateTimeButton.scss

@@ -79,13 +79,13 @@
 
   &.only-time-container {
     min-width: 5.3rem;
-    max-width: 5.3rem;
+    max-width: 8.3rem;
+    flex-grow: 1;
     min-height: 2.75rem;
     border: 2px solid $snippet-calendar-disabled-button-border-color;
   }
 
   &.calendar-view {
-    min-width: auto;
     max-width: none;
     min-height: auto;
   }

package/src/styles/iframe-events/Calendar.scss

@@ -75,7 +75,7 @@
       .calendar-weekdays,
       .calendar-dates {
         display: grid;
-        grid-template-columns: repeat(7, auto);
+        grid-template-columns: repeat(7, 1fr);
         grid-gap: 0.5rem 1rem;
       }