@licklist/design 0.72.7 → 0.72.72-dev.0

package/src/header/Header.stories.tsx

@@ -1,87 +1,38 @@
-import Nav from 'react-bootstrap/Nav'
+import React from 'react'
 import StyledButton from '../static/StyledButton'
 import BookeditHeader from './BookeditHeader'
 import CompanySelector from './elements/CompanySelector'
-import LicklistHeader from './LicklistHeader'
+import { NavigationItem } from './Header'
 
-const providerNavItems = [
-  { href: `/profile`, label: 'profile' },
-  { href: `/events`, label: 'events' },
-  { href: `/sales`, label: 'salesAndEnquiries' },
-  { href: `/product-sets`, label: 'productSets' },
-  { href: `/affiliates`, label: 'affiliates' },
-  { href: `/product-groups`, label: 'productGroups' },
-  { href: '/#', label: 'loyalty' },
-  { href: '/#', label: 'emailAndSms' },
-  { href: '/#', label: 'followersAndProfiles' },
+const providerNavItems: NavigationItem[] = [
+  { href: `/profile`, label: 'profile', pathname: [] },
+  { href: `/events`, label: 'events', pathname: [] },
+  { href: `/sales`, label: 'salesAndEnquiries', pathname: [] },
+  { href: `/product-sets`, label: 'productSets', pathname: [] },
+  { href: `/affiliates`, label: 'affiliates', pathname: [] },
+  { href: `/product-groups`, label: 'productGroups', pathname: [] },
+  { href: '/#', label: 'loyalty', pathname: [] },
+  { href: '/#', label: 'emailAndSms', pathname: [] },
+  { href: '/#', label: 'followersAndProfiles', pathname: [] },
 ]
 
 export default {
   title: 'Header',
 }
 
-export const Licklist = () => (
-  <>
-    <LicklistHeader
-      leftNavs={
-        <>
-          <ul className='navbar-nav bd-navbar-nav flex-row navbar-nav-primary'>
-            <li className='nav-item px-3 px-sm-3 px-lg-4'>
-              <Nav.Link href='#'>
-                <FaSearch />
-              </Nav.Link>
-            </li>
-            <li className='nav-item px-3 px-sm-4 d-none d-sm-inline'>
-              <Nav.Link href='#' className='nav-link-light-grey'>
-                Explore
-              </Nav.Link>
-            </li>
-            <li className='nav-item px-3 px-sm-4 d-none d-sm-inline'>
-              <Nav.Link href='#' className=''>
-                Galleries
-              </Nav.Link>
-            </li>
-          </ul>
-        </>
-      }
-    >
-      <StyledButton size='sm' className='rounded-pill mr-2'>
-        Login
-      </StyledButton>
-      <StyledButton
-        size='sm'
-        className='rounded-pill'
-        variant='outline-secondary'
-      >
-        Sign up
-      </StyledButton>
-    </LicklistHeader>
-  </>
-)
-
-Licklist.story = {
-  parameters: {
-    info: `
-      Licklist header component
-    `,
-  },
-}
-
 export const Bookedit = () => (
-  <>
-    <BookeditHeader navItems={providerNavItems}>
-      <StyledButton size='sm' className='rounded-pill mr-2'>
-        Login
-      </StyledButton>
-      <StyledButton
-        size='sm'
-        className='rounded-pill'
-        variant='outline-secondary'
-      >
-        Sign up
-      </StyledButton>
-    </BookeditHeader>
-  </>
+  <BookeditHeader navItems={providerNavItems}>
+    <StyledButton size='sm' className='rounded-pill mr-2'>
+      Login
+    </StyledButton>
+    <StyledButton
+      size='sm'
+      className='rounded-pill'
+      variant='outline-secondary'
+    >
+      Sign up
+    </StyledButton>
+  </BookeditHeader>
 )
 
 Bookedit.story = {
@@ -93,23 +44,21 @@ Bookedit.story = {
 }
 
 export const BookeditWithElements = () => (
-  <>
-    <BookeditHeader
-      leftNavs={
-        <div className='header-elements'>
-          <CompanySelector
-            value={1}
-            list={[
-              { id: 1, title: 'Company #1' },
-              { id: 2, title: 'Company #2' },
-            ]}
-            onChange={() => null}
-          />
-        </div>
-      }
-      navItems={providerNavItems}
-    />
-  </>
+  <BookeditHeader
+    leftNavs={
+      <div className='header-elements'>
+        <CompanySelector
+          value={1}
+          list={[
+            { id: 1, title: 'Company #1' },
+            { id: 2, title: 'Company #2' },
+          ]}
+          onChange={() => null}
+        />
+      </div>
+    }
+    navItems={providerNavItems}
+  />
 )
 
 BookeditWithElements.story = {

package/src/header/Header.tsx

@@ -1,11 +1,23 @@
+import { Accordion } from '@mantine/core'
 import { ReactNode } from 'react'
 import Nav from 'react-bootstrap/Nav'
 import Navbar from 'react-bootstrap/Navbar'
+import { NavLink } from 'react-router-dom'
 
-interface NavigationItem {
-  href: string
-  label: string
-}
+export type NavigationItem =
+  | {
+      href: string
+      label: string
+      pathname: string[]
+    }
+  | {
+      label: string
+      links: {
+        href: string
+        label: string
+        pathname: string[]
+      }[]
+    }
 
 type Props = {
   children?: ReactNode | ReactNode[]
@@ -53,11 +65,37 @@ function Header({
             renderMobileNavigation(navItems)
           ) : (
             <Nav className='mr-auto'>
-              {navItems.map(({ label, href }) => (
-                <Nav.Link href={href} key={`${href}${label}`}>
-                  {label}
-                </Nav.Link>
-              ))}
+              {navItems.map((item) => {
+                if ('links' in item) {
+                  return (
+                    <Accordion defaultValue='Apples'>
+                      <Accordion.Item value={item.label}>
+                        <Accordion.Control>{item.label}</Accordion.Control>
+                        {item.links.map((subItem) => (
+                          <Accordion.Panel key={subItem.href + subItem.label}>
+                            <Nav.Item key={`${subItem.label}-${subItem.href}`}>
+                              {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+                              {/* @ts-ignore */}
+                              <NavLink
+                                exact
+                                to={subItem.href}
+                                className='nav-link'
+                              >
+                                {subItem.label}
+                              </NavLink>
+                            </Nav.Item>
+                          </Accordion.Panel>
+                        ))}
+                      </Accordion.Item>
+                    </Accordion>
+                  )
+                }
+                return (
+                  <Nav.Link href={item.href} key={`${item.href}${item.label}`}>
+                    {item.label}
+                  </Nav.Link>
+                )
+              })}
             </Nav>
           )}
         </Navbar.Collapse>

package/src/header/index.ts

@@ -1,7 +1,7 @@
 import BookeditHeader from './BookeditHeader'
-import LicklistHeader from './LicklistHeader'
 import Header from './Header'
 
 export * from './elements'
 
-export { LicklistHeader, BookeditHeader, Header }
+export { BookeditHeader, Header }
+export type { NavigationItem } from './Header'

package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.tsx

@@ -48,12 +48,12 @@ export const ProductWithModifierSetModal = ({
           </button>
         </div>
         <div className='right-block' id='select-event-container'>
-          <div className={clsx('manual-booking-container', !product?.images?.length && 'tw-mt-8')}>
+          <div className={clsx('manual-booking-container', !product.images.length && 'tw-mt-8')}>
             <div className='manual-booking-header'>
               <TicketDescription
                 title={product.name}
                 description={product.description}
-                className={clsx('iframe-event__product-description', !product?.images?.length && 'mt-6')}
+                className={clsx('iframe-event__product-description', !product.images.length && 'mt-6')}
                 classNameProductModal='d-block'
                 images={product.images}
                 isRequired={product.isRequired}

package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx

@@ -35,9 +35,6 @@ export const ModifiersSetControl = ({
   const { t } = useTranslation('App')
 
   const orderModifiersSets = watch(`${productId}.orderProductModifiers`)
-  const filteredOrderModifiersSets = orderModifiersSets
-    ?.flat(Infinity)
-    ?.filter((item) => item && typeof item === 'object')
 
   const { formatNumber } = useIntl()
   const formatToCurrency = (value: number) =>
@@ -61,9 +58,8 @@ export const ModifiersSetControl = ({
     const selectedModifier = modifiers?.find(
       (item) => item.id === Number(e.target.defaultValue || e.target.id),
     )
-
     const checkSelectedModifier =
-      filteredOrderModifiersSets?.find(
+      orderModifiersSets?.find(
         (modifier) => modifier?.modifierId === selectedModifier?.id,
       )?.quantity === 1
 
@@ -129,11 +125,9 @@ export const ModifiersSetControl = ({
     )
   }, [isEditMode])
 
-  const radioButtonDefaultModifier = currentOrderModifiersSets
-    .find((modifier) =>
-      modifierSet.modifiers.some((rl) => rl.id === modifier.modifierId),
-    )
-    ?.modifierId.toString()
+  const radioButtonDefaultModifier = currentOrderModifiersSets.find((modifier) => 
+    modifierSet.modifiers.some((rl) => rl.id === modifier.modifierId)
+)?.modifierId.toString();
 
   return (
     <>
@@ -173,9 +167,7 @@ export const ModifiersSetControl = ({
                             inline
                             id={modifier.id.toString()}
                             defaultChecked={!!selectedOrderModifierId}
-                            defaultValue={
-                              selectedOrderModifierId || modifier.id.toString()
-                            }
+                            defaultValue={selectedOrderModifierId || modifier.id.toString()}
                             checked={field.value === modifier.id.toString()}
                             onChange={onChange}
                             type='radio'

package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx

@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl'
 import * as Config from '@licklist/core/dist/Config'
 import { OrderItem } from '@licklist/plugins/dist/types/context/Iframe/orderItems'
 import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
+import { calculateTotalModifiersPrice } from '../../utils'
 import { ProductWithModifier } from '../../../CategoryProduct/components/ProductWithModifier/ProductWithModifier'
 
 

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

@@ -89,6 +89,7 @@ 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}
@@ -101,6 +102,14 @@ 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,6 +61,7 @@ const processedPaymentSummary = ({
   const total = order.fullAmount || calculateTotalPrice(order, externalPaymentDetail)
 
   const totalDiscount = calculateTotalDiscount(order.payments)
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

package/src/iframe/payment/payment-page/PaymentPage.tsx

@@ -162,7 +162,7 @@ export const PaymentPage = ({
             <BookingSummary
               {...bookingSummaryProps}
               isPaymentPage
-              headerTitle={t('totalBooking')}
+              headerTitle={t('remainingBalance')}
               headerComponent={<SummaryTotalBlock amount={totalBooked} />}
               footer={
                 <div className='d-flex flex-column justify-content-between'>

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

@@ -61,20 +61,22 @@ 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
@@ -86,7 +88,6 @@ 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 { forwardRef } from 'react'
+import React, { forwardRef } from 'react'
 
 interface Props {
   children?: React.ReactNode | React.ReactNode[]

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

@@ -434,6 +434,7 @@ 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 || ''}

package/src/product-set/control/ProductSetControl.tsx

@@ -225,7 +225,7 @@ export function ProductSetControl({
           </>
         )}
 
-        <SaleDeadline disabled={false} onlyBefore />
+        <SaleDeadline disabled={false} isProductSet />
 
         <div className='divider' />
 

package/src/product-set/form/ProductSetForm.tsx

@@ -13,7 +13,7 @@ import { isEqual } from 'lodash'
 import { ProviderBookingManagementSetting } from '@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper'
 import { Zone } from '@licklist/core/dist/DataMapper/Provider/ZoneDataMapper'
 import { WorkHour } from '@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper'
-import { transformErrorToMessage } from '@licklist/plugins'
+import { transformErrorToMessage } from '@licklist/plugins/dist/utils/error'
 import { Dialog, useDialogContext } from '../../modals/dialog'
 import {
   ProductSetControl,
@@ -33,12 +33,16 @@ import { ErrorModal } from '../../iframe/order-process/components/ErrorModal'
 export interface WithIsLoading {
   isLoading: boolean
 }
+export interface WithIdOptional {
+  id?: number
+}
+
 export interface WithId {
   id: number
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithId,
+    WithIdOptional,
     ProductSetControlValues {
   steps: Step[]
   isOverrides?: boolean

package/src/product-set/form/ProductZonesControl.tsx

@@ -1,7 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import React, { useContext, useState } from 'react'
-
+import { useContext, useState } from 'react'
 import {
   ArrayPath,
   Controller,

package/src/product-set/form/SubProductsControl.tsx

@@ -70,9 +70,6 @@ export function SubProductsControl({
                   images: subProducts[index]?.images as Image[],
                 }
                 // @ts-expect-error TS2345
-                // @TODO fix prod type error
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 append(subProductCopy)
               }}
             />

package/src/product-set/form/VenueMapsControl.tsx

@@ -46,9 +46,6 @@ export const VenueMapsControl = ({
                             url={image.url}
                             name={name}
                             points={points}
-                            // @TODO fix prod type error
-                            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                            // @ts-ignore
                             products={products}
                             pointProducts={pointProducts}
                             onPointProductsChange={onPointProductsChange}

package/src/product-set/product/ProductControl.tsx

@@ -34,7 +34,6 @@ import {
 } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { useImages } from '@licklist/plugins/dist/hooks/Media/useImages'
-
 import {
   Image,
   IMAGE_TYPE_IMAGE,

package/src/product-set/product/advanced-options/AdvancedOptions.tsx

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { Col, Form } from 'react-bootstrap'
 import { Controller, Path, useFormContext } from 'react-hook-form'
 import { HookFormService } from '@licklist/plugins'

package/src/product-set/product/booking-management/ProductBookingManagementControl.tsx

@@ -86,6 +86,7 @@ export function ProductBookingManagementControl<T extends FormValues>(
               <Form.Control
                 ref={ref}
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 min={0}
                 step={1}
                 value={value as string}
@@ -129,6 +130,7 @@ export function ProductBookingManagementControl<T extends FormValues>(
               <Form.Control
                 ref={ref}
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 min='0'
                 step='1'
                 value={value as string}

package/src/product-set/product/deposit/ProductDepositControl.tsx

@@ -50,6 +50,7 @@ export function ProductDepositControl<T extends FormValues>(
               <Form.Control
                 ref={ref}
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 min={0}
                 max={Number(totalPrice)}
                 step='0.01'

package/src/product-set/product/duration/ProductDurationControl.tsx

@@ -91,6 +91,7 @@ export const ProductDurationControl = <T,>({
                 <Form.Control
                   type='number'
                   min={0}
+                  onWheel={(event) => event.currentTarget.blur()}
                   step={1}
                   value={durationHours}
                   disabled={disabled}
@@ -127,6 +128,7 @@ export const ProductDurationControl = <T,>({
                   type='number'
                   min={0}
                   step={1}
+                  onWheel={(event) => event.currentTarget.blur()}
                   disabled={disabled}
                   value={durationMinutes}
                   isInvalid={isInvalid}

package/src/product-set/product/price/ProductPriceControl.tsx

@@ -59,6 +59,7 @@ export function ProductPriceControl<T extends FormValues>({
                 ref={ref}
                 type='number'
                 min={0}
+                onWheel={(event) => event.currentTarget.blur()}
                 max={999999.99}
                 step='0.01'
                 value={value as string}

package/src/product-set/product/quantity/ProductQuantityConstantControl.tsx

@@ -111,6 +111,7 @@ export function ProductQuantityConstantControl<T extends FormValues>(
                   type='number'
                   min={0}
                   step={1}
+                  onWheel={(event) => event.currentTarget.blur()}
                   value={value as string}
                   isInvalid={HookFormService.isInvalid<T>(
                     `${fieldNamePrefix}.totalQuantity` as Path<T>,
@@ -165,6 +166,7 @@ export function ProductQuantityConstantControl<T extends FormValues>(
                   type='number'
                   min={0}
                   step={1}
+                  onWheel={(event) => event.currentTarget.blur()}
                   value={value as string}
                   onChange={onChange}
                   onFocus={onFocus}

package/src/product-set/product/quantity/ProductQuantityControl.tsx

@@ -85,6 +85,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   type='number'
                   min={0}
                   step={1}
+                  onWheel={(event) => event.currentTarget.blur()}
                   value={value as string}
                   onChange={onChange}
                   onFocus={onFocus}
@@ -143,6 +144,7 @@ export function ProductQuantityControl<T extends FormValues>(
                   type='number'
                   min={0}
                   step={1}
+                  onWheel={(event) => event.currentTarget.blur()}
                   value={value && (value as string)}
                   onFocus={onFocus}
                   onChange={onChange}

package/src/product-set/product/quantity/ProductQuantityRechargingControl.tsx

@@ -69,6 +69,7 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
                 type='number'
                 min={0}
                 step={1}
+                onWheel={(event) => event.currentTarget.blur()}
                 {...register(`${fieldNamePrefix}.totalQuantity` as Path<T>, {
                   validate: (value) => {
                     if (unlimited) return true

package/src/product-set/product-category/ProductCategoryControl.tsx

@@ -221,6 +221,7 @@ export function ProductCategoryControl({
                       step={1}
                       value={value === null ? '' : value}
                       onChange={onChange}
+                      onWheel={(event) => event.currentTarget.blur()}
                       isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
                         `${fieldNamePrefix}.minSubItems` as const,
                         errors,
@@ -293,6 +294,7 @@ export function ProductCategoryControl({
                       name={name}
                       value={value === null ? '' : value}
                       onChange={onChange}
+                      onWheel={(event) => event.currentTarget.blur()}
                       isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
                         `${fieldNamePrefix}.maxSubItems` as const,
                         errors,
@@ -353,6 +355,7 @@ export function ProductCategoryControl({
                       min={0}
                       step={1}
                       type='number'
+                      onWheel={(event) => event.currentTarget.blur()}
                       disabled={isOverride}
                       isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
                         `${fieldNamePrefix}.overallQuantity`,
@@ -543,6 +546,7 @@ export function ProductCategoryControl({
                       step={1}
                       value={value}
                       onChange={onChange}
+                      onWheel={(event) => event.currentTarget.blur()}
                       isInvalid={HookFormService.isInvalid<ProductSetFormValues>(
                         `${fieldNamePrefix}.remainderExpireAfter` as const,
                         errors,

package/src/product-set/product-zone/ProductZoneControl.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useMemo } from 'react'
+import { useContext, useEffect, useMemo } from 'react'
 import { Col, Form, Row } from 'react-bootstrap'
 import {
   ArrayPath,

package/src/recurrence-input/RecurrenceEndInput.tsx

@@ -109,6 +109,7 @@ function RecurrenceEndInput({
                 type='number'
                 min={1}
                 max={500}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={disabled || !count || count === 500}
                 aria-label='Occurrence count'
                 value={count ?? defaultOccurrences[frequency]}

package/src/recurring-date-picker-input/RecurrenceEndInput.tsx

@@ -91,6 +91,7 @@ function RecurrenceEndInput({
                 type='number'
                 min={1}
                 max={500}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={disabled || !count || count === 500}
                 aria-label='Occurrence count'
                 value={count ?? defaultOccurrences[frequency]}

package/src/resource/form/components/CapacityControl.tsx

@@ -27,6 +27,7 @@ export const CapacityControl = ({ isLoading }: CapacityControlProps) => {
           required: true,
           min: 1,
         })}
+        onWheel={(event) => event.currentTarget.blur()}
         placeholder={t('Design:capacity')}
         isInvalid={Boolean(errors.capacity)}
         disabled={isLoading}