@licklist/design 0.70.8-dev.0 → 0.70.9

package/dist/zone/form/components/GameDurationControl.js

@@ -77,9 +77,6 @@ var GameDurationControl = function(param) {
                 required: false,
                 min: 1
             })), {
-                onWheel: function(event) {
-                    return event.currentTarget.blur();
-                },
                 placeholder: t('Design:duration'),
                 isInvalid: Boolean(errors.defaultDuration),
                 disabled: isLoading

package/dist/zone/form/components/SortControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAoC1D,CAAA"}
+{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAmC1D,CAAA"}

package/dist/zone/form/components/SortControl.js

@@ -77,9 +77,6 @@ var SortControl = function(param) {
                 required: false,
                 min: 1
             })), {
-                onWheel: function(event) {
-                    return event.currentTarget.blur();
-                },
                 placeholder: t('Design:ordering'),
                 isInvalid: Boolean(errors.sort),
                 disabled: isLoading

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.70.8-dev.0",
+  "version": "0.70.9",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,9 +42,9 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.31.1-dev.4",
+    "@licklist/core": "0.30.3",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.34.0-dev.4",
+    "@licklist/plugins": "0.33.6",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
     "react": "17.0.2",
@@ -61,9 +61,9 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@licklist/core": "0.31.1-dev.4",
+    "@licklist/core": "0.31.3",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.34.0-dev.4",
+    "@licklist/plugins": "0.33.6",
     "@mantine/core": "6.0.22",
     "@mantine/hooks": "6.0.22",
     "@mdx-js/react": "1.6.22",
@@ -202,10 +202,8 @@
       "yarn tsc"
     ]
   },
-  "packageManager": "yarn@4.4.0",
   "volta": {
     "node": "20.9.0",
     "yarn": "4.4.0"
-  },
-  "stableVersion": "0.69.1-dev.3"
+  }
 }

package/src/affiliate/form/AffiliateForm.tsx

@@ -76,7 +76,6 @@ export const AffiliateForm = ({
   const copyToClipboard = () =>
     // eslint-disable-next-line consistent-return
     window.navigator.clipboard.writeText(formValues.link)
-
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(handleSubmit)}>

package/src/assets/iframe/available.svg

@@ -1,5 +1,5 @@
-<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 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>

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: 'Error',
-      message: error?.response?.data?.message || error.message,
+      message: error.message,
     })
   }
 

package/src/availability-indicator/AvailabilityIndicator.tsx

@@ -1,15 +1,9 @@
 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
@@ -19,94 +13,38 @@ type Config = {
   Icon: FunctionComponent<SVGProps<SVGSVGElement>>
 }
 
-type GetIconsAndLabelsWithArgumentResult = Config & {
-  argument?: number
-}
-
-interface GetIconsAndLabels extends ZoneResourcesAvailability {
-  availabilityFormat?: AvailabilityFormat | null
-}
-interface GetAppropreateLabelFormat extends GetIconsAndLabels {
-  label?: string
-}
-
-const getLabelsWithArgument = ({
+const getIconsAndLabels = ({
   bookedResources,
   totalResources,
-  availabilityFormat,
-  label,
-}: GetAppropreateLabelFormat): {
-  label: string
-  argument?: number
-} => {
-  const availableResources = totalResources - bookedResources
-
-  if (availabilityFormat !== AVAILABILITY_FORMAT_NUMBER) {
-    return { label }
+}: ZoneResourcesAvailability): Config => {
+  if (bookedResources === totalResources) {
+    return { label: 'soldOut', Icon: SoldOutIcon }
   }
 
-  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 {
-      ...getLabelsWithArgument({
-        bookedResources,
-        totalResources,
-        availabilityFormat,
-        label: 'lotsOfSpace',
-      }),
-      Icon: AvailableIcon,
-    }
+    return { label: 'lotsOfSpace', Icon: AvailableIcon }
   }
 
   if (bookedResources / totalResources >= LIMITED_LIMIT) {
-    return {
-      ...getLabelsWithArgument({
-        bookedResources,
-        totalResources,
-        availabilityFormat,
-        label: 'limited',
-      }),
-      Icon: LimitedIcon,
-    }
+    return { label: 'limited', Icon: LimitedIcon }
   }
 
-  return {
-    ...getLabelsWithArgument({
-      bookedResources,
-      totalResources,
-      availabilityFormat,
-      label: 'available',
-    }),
-    Icon: AvailableIcon,
-  }
+  return { label: 'available', Icon: AvailableIcon }
 }
 
 type AvailabilityIndicatorProps = {
-  resources?: ZoneResourcesAvailability
+  resources: ZoneResourcesAvailability
   isUnavailable?: boolean
   isSoldOut?: boolean
-  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const AvailabilityIndicator = ({
   resources,
   isUnavailable,
-  isSoldOut: _isSoldOut,
-  availabilityFormat,
+  isSoldOut,
 }: AvailabilityIndicatorProps) => {
   const { t } = useTranslation('Design')
-  const isSoldOut =
-    _isSoldOut || resources?.bookedResources === resources?.totalResources
 
   if (isUnavailable) {
     return <Indicator Icon={SoldOutIcon} label={t('notAvailable')} />
@@ -116,27 +54,14 @@ export const AvailabilityIndicator = ({
     return <Indicator Icon={SoldOutIcon} label={t('soldOut')} />
   }
 
-  const { Icon, label, argument } = getIconsAndLabelsWithArgument({
-    ...resources,
-    availabilityFormat,
-  })
+  const { Icon, label } = getIconsAndLabels(resources)
 
-  return (
-    <Indicator
-      Icon={Icon}
-      label={t(label, argument ? { argument } : undefined)}
-    />
-  )
+  return <Indicator Icon={Icon} label={t(label)} />
 }
 
-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>
-  )
-}
+const Indicator = ({ Icon, label }: Config) => (
+  <div className='availability-indicator'>
+    <Icon />
+    <div>{label}</div>
+  </div>
+)

package/src/calendar/Calendar.tsx

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

package/src/calendar/utils/index.ts

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

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

@@ -2,7 +2,6 @@ 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'
 
@@ -22,7 +21,6 @@ export type DateTimeButtonProps = {
   resources?: ZoneResourcesAvailability | null
   showResources?: boolean
   variant: Variant
-  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const DateTimeButton = ({
@@ -35,7 +33,6 @@ export const DateTimeButton = ({
   resources,
   showResources,
   variant = Variant.week,
-  availabilityFormat,
 }: DateTimeButtonProps) => {
   const isSoldOut =
     _isSoldOut ||
@@ -46,7 +43,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'
@@ -70,11 +67,10 @@ export const DateTimeButton = ({
         variant={variant}
       />
       {price && !isDisabled && <div className='price'>{price}</div>}
-      {showResources && (resources || isUnavailable) && (
+      {showResources && resources && (
         <AvailabilityIndicator
-          availabilityFormat={availabilityFormat}
           resources={resources}
-          isUnavailable={isUnavailable}
+          isUnavailable={_isDisabled || isPast}
           isSoldOut={isSoldOut}
         />
       )}

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -39,6 +39,7 @@ export const getDefaultValues = (
               ...product,
               subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
+                originalProductId: null,
                 productCategoryId: undefined,
               })),
               productCategoryId: undefined,

package/src/events/event-venue-map/EventVenueMap.tsx

@@ -49,7 +49,6 @@ export const EventVenueMap = forwardRef<VenueMapRef, EventVenueMapProps>(
     },
     ref,
   ) => {
-    // TODO fix often updating of canvasSizes, which leads to flashing poingts
     const canvasSizes = useCanvasSize({ width, height })
 
     return (

package/src/events/event-venue-map/hooks/useCanvasSize.ts

@@ -10,17 +10,13 @@ export const useCanvasSize = ({
   width: componentWidth,
   height: componentHeight,
 }: CanvasSizeProps) => {
-  // TODO Fix often updating of width and height
   const { width, height } = useWindowDimensions()
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const memoizedDimensions = useMemo(() => ({ width, height }), [width])
-
   const memoedComponentParameters = useMemo(() => {
     if (!componentWidth && !componentHeight) return null
 
     return { width: componentWidth, height: componentHeight }
   }, [componentWidth, componentHeight])
 
-  return memoedComponentParameters || memoizedDimensions
+  return memoedComponentParameters || { width, height }
 }

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

@@ -2,7 +2,6 @@ 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'
@@ -19,7 +18,6 @@ export type ActivityCardProps = {
   availableTimes?: string | null
   image?: Image | null
   resources?: ZoneResourcesAvailability
-  availabilityFormat?: AvailabilityFormat | null
 }
 
 export const ActivityCard = ({
@@ -32,7 +30,6 @@ export const ActivityCard = ({
   onSelect,
   isSelected,
   layout = LAYOUT_GRID,
-  availabilityFormat,
   resources,
 }: ActivityCardProps) => {
   if (layout === LAYOUT_GRID) {
@@ -53,12 +50,7 @@ export const ActivityCard = ({
           {description && (
             <div className='mt-2 activity-card-description'>{description}</div>
           )}
-          {resources && (
-            <AvailabilityIndicator
-              resources={resources}
-              availabilityFormat={availabilityFormat}
-            />
-          )}
+          {resources && <AvailabilityIndicator resources={resources} />}
         </div>
       </button>
     )
@@ -84,12 +76,7 @@ export const ActivityCard = ({
         {description && (
           <div className='mt-2 activity-card-description'>{description}</div>
         )}
-        {resources && (
-          <AvailabilityIndicator
-            resources={resources}
-            availabilityFormat={availabilityFormat}
-          />
-        )}
+        {resources && <AvailabilityIndicator resources={resources} />}
       </div>
 
       <hr className='list-activity-card-hr' />

package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx

@@ -89,7 +89,6 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <FormControl
           type='number'
           onChange={(e) => handleChangeValue(Number(e.target.value))}
-          onWheel={(event) => event.currentTarget.blur()}
           value={value}
           min={0}
           max={max}
@@ -102,14 +101,6 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
         <button
           type='button'
           onClick={handleArrowUpClick}
-          onWheel={(event) => event.currentTarget.blur()}
-          onFocus={(event) =>
-            event.target.addEventListener(
-              'wheel',
-              (event) => event.preventDefault(),
-              { passive: false },
-            )
-          }
           className={`payment-number-input__btn-up ${
             plusButtonGreyedOut && 'disabled-number-input-button'
           }`}

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -61,7 +61,6 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail)
 
   const totalDiscount = calculateTotalDiscount(order.payments)
-
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

package/src/iframe/ryft/utils/ryft-form.ts

@@ -61,22 +61,20 @@ export const injectComponentsInRyftForm = ({
   divider.id = 'mobile-pay-divider'
   container.id = 'mobile-pay-divider-container'
   container.append(dividerText, divider)
-  const payIframe = document.getElementById('ryft-pay-iframe')
+  const payIframe = document.getElementById("ryft-pay-iframe");
   if (payIframe) {
     const formBox = document.getElementById('form-disable-box')
     if (formBox) {
-      formBox.style.display = isDisableButton ? 'block' : 'none'
+      formBox.style.display = isDisableButton ? "block" : "none"
     }
 
     const googleButton = document.getElementById(
       'gpay-button-online-api-id',
     ) as HTMLButtonElement
-    const appleButton = document.getElementById(
-      'ryft-pay-apple-pay-button',
-    ) as HTMLButtonElement
+    const appleButton =document.getElementById("ryft-pay-apple-pay-button") as HTMLButtonElement
     if (googleButton) {
       googleButton.disabled = isDisableButton
-      googleButton.style.opacity = !isDisableButton ? '1' : '0.6'
+      googleButton.style.opacity = isDisableButton ? '1' : '0.6'
     }
     if (appleButton) {
       appleButton.disabled = isDisableButton
@@ -88,6 +86,7 @@ export const injectComponentsInRyftForm = ({
     const applePayButton = document.createElement('button')
     applePayButton.id = 'apple-pay'
     applePayButton.type = 'button'
+    applePayButton.style.opacity = !isDisableButton ? '1' : '0.6'
     applePayButton.className = 'bg-dark btn btn-primary apple-pay-button'
     applePayButton.textContent = t('Events:payWithApple')
     applePayButton.onclick = onApplePayButtonClick

package/src/layout/DropDown.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 interface Props {
   children?: React.ReactNode | React.ReactNode[]

package/src/notification/email-template/control/EmailTemplateControl.tsx

@@ -434,7 +434,6 @@ export const EmailTemplateControl = forwardRef(
                           `templateOptionValues.${option?.id}.value`,
                         )}
                         type='number'
-                        onWheel={(event) => event.currentTarget.blur()}
                         placeholder={t(`Design:${option.name}`)}
                         id={option.name + option.id}
                         defaultValue={option.selectedValue || ''}