@licklist/design 0.72.71 → 0.72.72-dev.0

package/src/sales/booking/results/components/ResultCard.tsx

@@ -20,8 +20,6 @@ export type ResultCardProps = {
   onCardClick?: (id: number) => void
 }
 
-// @TODO integrate when API will be available
-// activity and staff keys
 export const ResultCard = ({
   order,
   className,

package/src/sales/coupon/control/CouponFormControl.tsx

@@ -179,6 +179,7 @@ export const CouponFormControl = ({
               <Form.Label>{t('Design:discount')}</Form.Label>
               <Form.Control
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 isInvalid={errors.discount !== undefined}
                 {...register('discount', {
                   required: t('Validation:fieldRequired', {
@@ -316,6 +317,7 @@ export const CouponFormControl = ({
               <Form.Control
                 {...register('totalCoupons')}
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 isInvalid={errors.totalCoupons !== undefined}
                 disabled={isLoading}
               />
@@ -330,6 +332,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type='number'
                 {...register('usesPerUser')}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={isLoading}
               />
             </Form.Group>
@@ -342,6 +345,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type='number'
                 {...register('useAgain')}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={isLoading}
               />
               <Form.Text className='text-muted'>
@@ -355,6 +359,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type='number'
                 {...register('usesPerUserDay')}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={isLoading}
               />
               <Form.Text className='text-muted'>
@@ -370,6 +375,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type='number'
                 {...register('minAmount')}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={isLoading}
               />
               <Form.Text className='text-muted'>
@@ -383,6 +389,7 @@ export const CouponFormControl = ({
               <Form.Control
                 type='number'
                 {...register('maxAmount')}
+                onWheel={(event) => event.currentTarget.blur()}
                 disabled={isLoading}
               />
               <Form.Text className='text-muted'>

package/src/sales/coupon/form/CouponFrom.tsx

@@ -12,7 +12,6 @@ import { useForm, FormProvider } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery'
 import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorService'
-
 import { CouponFormControl } from '../control'
 
 export interface CouponFormValues {
@@ -38,6 +37,7 @@ export interface CouponFormProps {
   productGroups?: ProductGroup[]
   defaultValues?: CouponFormValues
   onSubmit: (values: CouponFormValues) => void
+  onCancel: () => void
   isLoading?: boolean
   hasPermission: boolean
   serverErrors?: ServerError
@@ -45,6 +45,7 @@ export interface CouponFormProps {
 
 export const CouponForm = ({
   onSubmit,
+  onCancel,
   defaultValues,
   isLoading = false,
   productGroups,
@@ -73,13 +74,24 @@ export const CouponForm = ({
           isLoading={isLoading}
         />
         {hasPermission && (
-          <Button
-            className='mt-5 d-no dne d-md-block'
-            type='submit'
-            disabled={isLoading}
-          >
-            {t('save')}
-          </Button>
+          <div className='tw-flex tw-gap-4'>
+            <Button
+              className='d-md-block mt-5'
+              type='submit'
+              disabled={isLoading}
+            >
+              {t('save')}
+            </Button>
+            <Button
+              className='mt-5 d-md-block'
+              variant='outline-primary'
+              type='reset'
+              onClick={onCancel}
+              disabled={isLoading}
+            >
+              {t('cancel')}
+            </Button>
+          </div>
         )}
       </Form>
     </FormProvider>

package/src/setting/admin/PaymentFeeForm.tsx

@@ -74,6 +74,7 @@ export function PaymentFeeForm({ isLoading = false }: PaymentFeeFormProps) {
                     max={100}
                     step='1'
                     placeholder='0'
+                    onWheel={(event) => event.currentTarget.blur()}
                     {...register('feeInPercent', {
                       validate: {
                         moreThan: (v) => (v ? v >= 0 : true),
@@ -129,6 +130,7 @@ export function PaymentFeeForm({ isLoading = false }: PaymentFeeFormProps) {
                     max={999999.99}
                     step='0.01'
                     placeholder='0,00'
+                    onWheel={(event) => event.currentTarget.blur()}
                     isInvalid={Boolean(errors.minFeeInPounds)}
                     disabled={isLoading}
                   />
@@ -174,6 +176,7 @@ export function PaymentFeeForm({ isLoading = false }: PaymentFeeFormProps) {
                     max={999999.99}
                     step='0.01'
                     placeholder='0,00'
+                    onWheel={(event) => event.currentTarget.blur()}
                     isInvalid={Boolean(errors.maxFeeInPounds)}
                     disabled={isLoading}
                   />
@@ -231,6 +234,7 @@ export function PaymentFeeForm({ isLoading = false }: PaymentFeeFormProps) {
                     max={100}
                     step='1'
                     placeholder='0'
+                    onWheel={(event) => event.currentTarget.blur()}
                     isInvalid={Boolean(errors.vatInPercent)}
                     disabled={isLoading}
                   />
@@ -276,6 +280,7 @@ export function PaymentFeeForm({ isLoading = false }: PaymentFeeFormProps) {
                     max={999999.99}
                     step='0.01'
                     placeholder='0,00'
+                    onWheel={(event) => event.currentTarget.blur()}
                     isInvalid={Boolean(errors.fixedFee)}
                     disabled={isLoading}
                   />

package/src/setting/dashboard/DashboardSettingForm.tsx

@@ -178,6 +178,7 @@ export const DashboardSettingForm = ({
               <Form.Label>{t('metaPixelId')}</Form.Label>
               <Form.Control
                 type='number'
+                onWheel={(event) => event.currentTarget.blur()}
                 {...register('metaPixelId', {
                   minLength: {
                     value: 15,

package/src/sortable-tree/SortableTreeItem.tsx

@@ -1,9 +1,4 @@
-import {
-  ReactNode,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react'
+import { ReactNode, useCallback, useEffect, useState } from 'react'
 import { DndContext, useDraggable } from '@dnd-kit/core'
 import {
   SortableContext,

package/src/static/CurrencyNumberInput.tsx

@@ -45,6 +45,7 @@ export const CurrencyNumberInput = forwardRef<
           disabled={disabled}
           value={value}
           onChange={onChange}
+          onWheel={(event) => event.currentTarget.blur()}
           ref={ref}
           {...props}
         />

package/src/static/form-number-input/FormNumberInput.tsx

@@ -75,6 +75,7 @@ export const FormNumberInput = ({
               type='number'
               step={step}
               disabled={disabled}
+              onWheel={(event) => event.currentTarget.blur()}
               isInvalid={HookFormService.isInvalid(fieldName, errors)}
               {...field}
               onChange={(event) => {

package/src/static/number-input/NumberInput.tsx

@@ -49,6 +49,7 @@ export function NumberInput({
     <div className={inputWrapperClasses}>
       <FormControl
         type='number'
+        onWheel={(event) => event.currentTarget.blur()}
         onChange={(e) => onChange(Number(e.target.value))}
         value={value}
         min={min}

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

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

package/src/styles/iframe-external-modal/IframeExternalModal.scss

@@ -15,7 +15,7 @@ body[bkdt-scrollable='false'] .bkdt-mask {
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 1000000;
+  z-index: 2147483646;
   background-color: rgba(0, 0, 0, 0.5);
   display: none;
 }
@@ -24,7 +24,7 @@ body[bkdt-scrollable='false'] .bkdt-mask {
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 1000001;
+  z-index: 2147483647;
   display: none;
   width: 100%;
   height: 100%;

package/src/styles/product-set/ProductSetForm.scss

@@ -1,5 +1,4 @@
 .product-set-form {
-
   input,
   textarea,
   select,
@@ -211,8 +210,8 @@
 
 .sortable-tree-item-toggle {
   .product-zone-badge {
-    background-color: #EFE9F5;
-    color: #84269B;
+    background-color: #efe9f5;
+    color: #84269b;
     font-size: 0.875rem;
     font-weight: 600;
   }

package/src/styles/ryft-payment-form/RyftPaymentForm.scss

@@ -102,7 +102,6 @@
 }
 
 .ryft-payment-form {
-
   .form-disable-box {
     display: none;
     position: absolute;
@@ -184,7 +183,6 @@
 }
 
 @include media-breakpoint-up(md) {
-
   .ryft-payment-form,
   .form-disable-box {
     height: 50%;
@@ -213,4 +211,4 @@
   .divider {
     display: none !important;
   }
-}
+}

package/src/styles/sales/BookingResults.scss

@@ -5,7 +5,7 @@
     flex-wrap: wrap;
 
     .result-card {
-      height: 14.25rem;
+      height: 14rem;
       border: 1px solid $gray-400;
       max-width: calc(50% - 0.75rem);
       flex: 0 0 calc(50% - 0.75rem);

package/src/zone/form/components/GameDurationControl.tsx

@@ -29,6 +29,7 @@ export const GameDurationControl = ({
           required: false,
           min: 1,
         })}
+        onWheel={(event) => event.currentTarget.blur()}
         placeholder={t('Design:duration')}
         isInvalid={Boolean(errors.defaultDuration)}
         disabled={isLoading}

package/src/zone/form/components/SortControl.tsx

@@ -27,6 +27,7 @@ export const SortControl = ({ isLoading }: SortControlProps) => {
           required: false,
           min: 1,
         })}
+        onWheel={(event) => event.currentTarget.blur()}
         placeholder={t('Design:ordering')}
         isInvalid={Boolean(errors.sort)}
         disabled={isLoading}