@akinon/projectzero 1.104.0 → 1.105.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @akinon/projectzero
 
+## 1.105.0
+
 ## 1.104.0
 
 ## 1.103.0

package/app-template/CHANGELOG.md

@@ -1,5 +1,34 @@
 # projectzeronext
 
+## 1.105.0
+
+### Minor Changes
+
+- c39c700: ZERO-3420: Refactor Modal component
+- 3b255fe: ZERO-3629 :edit warnings in build
+
+### Patch Changes
+
+- Updated dependencies [c39c700]
+- Updated dependencies [d512ea2]
+- Updated dependencies [3b255fe]
+  - @akinon/next@1.105.0
+  - @akinon/pz-akifast@1.105.0
+  - @akinon/pz-b2b@1.105.0
+  - @akinon/pz-basket-gift-pack@1.105.0
+  - @akinon/pz-bkm@1.105.0
+  - @akinon/pz-checkout-gift-pack@1.105.0
+  - @akinon/pz-click-collect@1.105.0
+  - @akinon/pz-credit-payment@1.105.0
+  - @akinon/pz-gpay@1.105.0
+  - @akinon/pz-masterpass@1.105.0
+  - @akinon/pz-one-click-checkout@1.105.0
+  - @akinon/pz-otp@1.105.0
+  - @akinon/pz-pay-on-delivery@1.105.0
+  - @akinon/pz-saved-card@1.105.0
+  - @akinon/pz-tabby-extension@1.105.0
+  - @akinon/pz-tamara-extension@1.105.0
+
 ## 1.104.0
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.104.0",
+  "version": "1.105.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.104.0",
-    "@akinon/pz-akifast": "1.104.0",
-    "@akinon/pz-b2b": "1.104.0",
-    "@akinon/pz-basket-gift-pack": "1.104.0",
-    "@akinon/pz-bkm": "1.104.0",
-    "@akinon/pz-checkout-gift-pack": "1.104.0",
-    "@akinon/pz-click-collect": "1.104.0",
-    "@akinon/pz-credit-payment": "1.104.0",
-    "@akinon/pz-gpay": "1.104.0",
-    "@akinon/pz-masterpass": "1.104.0",
-    "@akinon/pz-one-click-checkout": "1.104.0",
-    "@akinon/pz-otp": "1.104.0",
-    "@akinon/pz-pay-on-delivery": "1.104.0",
-    "@akinon/pz-saved-card": "1.104.0",
-    "@akinon/pz-tabby-extension": "1.104.0",
-    "@akinon/pz-tamara-extension": "1.104.0",
+    "@akinon/next": "1.105.0",
+    "@akinon/pz-akifast": "1.105.0",
+    "@akinon/pz-b2b": "1.105.0",
+    "@akinon/pz-basket-gift-pack": "1.105.0",
+    "@akinon/pz-bkm": "1.105.0",
+    "@akinon/pz-checkout-gift-pack": "1.105.0",
+    "@akinon/pz-click-collect": "1.105.0",
+    "@akinon/pz-credit-payment": "1.105.0",
+    "@akinon/pz-gpay": "1.105.0",
+    "@akinon/pz-masterpass": "1.105.0",
+    "@akinon/pz-one-click-checkout": "1.105.0",
+    "@akinon/pz-otp": "1.105.0",
+    "@akinon/pz-pay-on-delivery": "1.105.0",
+    "@akinon/pz-saved-card": "1.105.0",
+    "@akinon/pz-tabby-extension": "1.105.0",
+    "@akinon/pz-tamara-extension": "1.105.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -62,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.104.0",
+    "@akinon/eslint-plugin-projectzero": "1.105.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/components/__tests__/link.test.tsx

@@ -30,6 +30,8 @@ describe('Link Component', () => {
     wrapper = container;
   });
 
+  wrapper;
+
   it('should render without error', () => {
     const link = screen.getByRole('link');
 

package/app-template/src/components/input.tsx

@@ -48,7 +48,13 @@ export const Input = forwardRef<
     props.className
   );
 
-  const inputProps: any = {
+  const inputProps: {
+    id?: string;
+    ref?: Ref<HTMLInputElement>;
+    className?: string;
+    onFocus?: () => void;
+    onBlur?: (event: FocusEvent<HTMLInputElement>) => void;
+  } = {
     id,
     ref,
     className: inputClass,

package/app-template/src/components/modal.tsx

@@ -4,16 +4,7 @@ import ReactPortal from './react-portal';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-}
+import { ModalProps } from '@theme/types';
 
 export const Modal = (props: ModalProps) => {
   const {
@@ -23,7 +14,14 @@ export const Modal = (props: ModalProps) => {
     setOpen,
     title = '',
     showCloseButton = true,
-    className
+    className,
+    overlayClassName,
+    headerWrapperClassName,
+    titleClassName,
+    closeButtonClassName,
+    iconName = 'close',
+    iconSize = 16,
+    iconClassName
   } = props;
 
   useEffect(() => {
@@ -38,7 +36,12 @@ export const Modal = (props: ModalProps) => {
 
   return (
     <ReactPortal wrapperId={portalId}>
-      <div className="fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50" />
+      <div
+        className={twMerge(
+          'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
+          overlayClassName
+        )}
+      />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
@@ -46,15 +49,28 @@ export const Modal = (props: ModalProps) => {
         )}
       >
         {(showCloseButton || title) && (
-          <div className="flex px-6 py-4 border-b border-gray-400">
-            {title && <h3 className="text-lg font-light">{title}</h3>}
+          <div
+            className={twMerge(
+              'flex px-6 py-4 border-b border-gray-400',
+              headerWrapperClassName
+            )}
+          >
+            {title && (
+              <h3 className={twMerge('text-lg font-light', titleClassName)}>
+                {title}
+              </h3>
+            )}
             {showCloseButton && (
               <button
                 type="button"
                 onClick={() => setOpen(false)}
-                className="ml-auto"
+                className={twMerge('ml-auto', closeButtonClassName)}
               >
-                <Icon name="close" size={16} />
+                <Icon
+                  name={iconName}
+                  size={iconSize}
+                  className={iconClassName}
+                />
               </button>
             )}
           </div>

package/app-template/src/components/pagination.tsx

@@ -125,6 +125,7 @@ export const Pagination = (props: PaginationProps) => {
       setPrevPage(1);
       setNextPage(1);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [page]);
 
   useEffect(() => {

package/app-template/src/components/select.tsx

@@ -14,14 +14,18 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
     error,
     label,
     required = false,
+    labelClassName,
     ...rest
   } = props;
 
   return (
     <label
-      className={clsx('flex flex-col relative text-xs text-gray-800', {
-        'pl-7': icon
-      })}
+      className={twMerge(
+        clsx('flex flex-col relative text-xs text-gray-800', {
+          'pl-7': icon
+        }),
+        labelClassName
+      )}
     >
       {icon && (
         <Icon
@@ -32,32 +36,40 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
       )}
 
       {label && (
-        <span className="mb-1">
+        <span className={twMerge('mb-1', labelClassName)}>
           {label} {required && <span className="text-secondary">*</span>}
         </span>
       )}
-      <select
-        {...rest}
-        ref={ref}
-        className={twMerge(
-          clsx(
-            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
-            !borderless &&
-              'border border-gray-200 transition-all duration-150 hover:border-primary'
-          ),
-          className
-        )}
-      >
-        {options?.map((option) => (
-          <option
-            key={option.value}
-            value={option.value}
-            className={option.class}
-          >
-            {option.label}
-          </option>
-        ))}
-      </select>
+      <div className="relative">
+        <select
+          {...rest}
+          ref={ref}
+          className={twMerge(
+            clsx(
+              'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
+              !borderless &&
+                'border border-gray-200 transition-all duration-150 hover:border-primary',
+              'appearance-none bg-transparent'
+            ),
+            className
+          )}
+        >
+          {options?.map((option) => (
+            <option
+              key={option.value}
+              value={option.value}
+              className={option.class}
+            >
+              {option.label}
+            </option>
+          ))}
+        </select>
+        <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
+          <svg className="h-4 w-4 fill-current" viewBox="0 0 20 20">
+            <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
+          </svg>
+        </div>
+      </div>
       {error && (
         <span className="mt-1 text-sm text-error">{error.message}</span>
       )}

package/app-template/src/components/types/index.ts

@@ -58,6 +58,7 @@ export interface SelectProps extends React.HTMLProps<HTMLSelectElement> {
   iconSize?: number;
   error?: FieldError | undefined;
   required?: boolean;
+  labelClassName?: string;
 }
 export interface IconProps extends React.ComponentPropsWithRef<'i'> {
   name: string;

package/app-template/src/plugins.js

@@ -14,5 +14,6 @@ module.exports = [
   'pz-akifast',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-tamara-extension'
+  'pz-tamara-extension',
+  'pz-hepsipay'
 ];

package/app-template/src/types/index.ts

@@ -125,3 +125,20 @@ export interface SeoProps {
   ogPriceAmount?: string;
   ogPriceCurrency?: string;
 }
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+  overlayClassName?: string;
+  headerWrapperClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
+  iconName?: string;
+  iconSize?: number;
+  iconClassName?: string;
+}

package/app-template/src/views/account/address-form.tsx

@@ -259,23 +259,25 @@ export const AddressForm = (props: Props) => {
       {/* TODO: Fix select and textarea components */}
 
       <Select
-        className="w-full border-gray-500 text-sm mt-2"
+        className="w-full border-gray-500 text-sm"
         options={countryOptions}
         {...register('country')}
         error={errors.country}
         data-testid="address-form-country"
         label={t('account.address_book.form.country.title')}
+        labelClassName="mb-3"
         required
       />
 
       {city && (
         <Select
-          className="w-full border-gray-500 text-sm mt-2"
+          className="w-full border-gray-500 text-sm"
           options={cityOptions}
           {...register('city')}
           error={errors.city}
           data-testid="address-form-city"
           label={t('account.address_book.form.province.title')}
+          labelClassName="mb-3"
           required
         />
       )}
@@ -283,24 +285,26 @@ export const AddressForm = (props: Props) => {
         <div className="flex gap-4">
           <div className="flex-1">
             <Select
-              className="w-full border-gray-500 text-sm mt-2"
+              className="w-full border-gray-500 text-sm"
               options={townshipOptions}
               {...register('township')}
               error={errors.township}
               data-testid="address-form-township"
               label={t('account.address_book.form.township.title')}
+              labelClassName="mb-3"
               required
             />
           </div>
           {district && (
             <div className="flex-1">
               <Select
-                className="w-full border-gray-500 text-sm mt-2"
+                className="w-full border-gray-500 text-sm"
                 options={districtOptions}
                 {...register('district')}
                 error={errors.district}
                 data-testid="address-form-district"
                 label={t('account.address_book.form.district.title')}
+                labelClassName="mb-3"
                 required
               />
             </div>

package/app-template/src/views/account/contact-form.tsx

@@ -111,7 +111,7 @@ const ContactForm = () => {
     resolver: yupResolver(contactFormSchema(t))
   });
 
-  const onSubmit: SubmitHandler<ContactFormType> = (data, event) => {
+  const onSubmit: SubmitHandler<ContactFormType> = (data) => {
     const formData = new FormData();
 
     Object.keys(data ?? {}).forEach((key) => {

package/app-template/src/views/account/content-header.tsx

@@ -31,13 +31,13 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 md:mb-0 md:w-56 md:mr-4 text-xs"
+        className="w-full mb-4 md:mb-0 md:w-56 text-xs"
         options={orders}
         data-testid="account-orders-header-select"
       ></Select>
       <Button
         className={clsx(
-          'w-full md:w-56',
+          'w-full md:w-56 md:ms-4',
           isButtonDisabled &&
             'hover:bg-black hover:text-white disabled:opacity-75'
         )}

package/app-template/src/views/account/faq/faq-tabs.tsx

@@ -3,6 +3,7 @@
 import { Accordion, LoaderSpinner, TabPanel, Tabs } from '@theme/components';
 import React from 'react';
 import { useGetWidgetQuery } from '@akinon/next/data/client/misc';
+import { useLocalization } from '@akinon/next/hooks';
 
 interface Props {
   searchKey?: string;
@@ -11,6 +12,7 @@ interface Props {
 export function FaqTabs(props: Props) {
   const { searchKey } = props;
   const { data, isLoading } = useGetWidgetQuery('faq');
+  const { locale } = useLocalization();
 
   if (isLoading) {
     return <LoaderSpinner className="mt-4" />;
@@ -29,8 +31,12 @@ export function FaqTabs(props: Props) {
               {data?.attributes?.faq_contents
                 ?.filter(
                   (faq) =>
-                    faq.value.content.toLocaleLowerCase().includes(searchKey) ||
-                    faq.value.title.toLocaleLowerCase().includes(searchKey)
+                    faq.value.content
+                      .toLocaleLowerCase(locale)
+                      .includes(searchKey) ||
+                    faq.value.title
+                      .toLocaleLowerCase(locale)
+                      .includes(searchKey)
                 )
                 .map((faq, index) => {
                   if (faq.value.category == item.value.category_id) {

package/app-template/src/views/basket/basket-item.tsx

@@ -39,7 +39,12 @@ export const BasketItem = (props: Props) => {
     quantity: number,
     attributes: object = {}
   ) => {
-    const requestParams: any = {
+    const requestParams: {
+      product: number;
+      quantity: number;
+      attributes: object;
+      namespace?: string;
+    } = {
       product: productPk,
       quantity,
       attributes

package/app-template/src/views/breadcrumb.tsx

@@ -12,7 +12,7 @@ export interface BreadcrumbProps {
 }
 
 export default function Breadcrumb(props: BreadcrumbProps) {
-  const { t } = useLocalization();
+  const { t, locale } = useLocalization();
   const { breadcrumbList = [] } = props;
 
   const list = [
@@ -28,7 +28,7 @@ export default function Breadcrumb(props: BreadcrumbProps) {
       {list.map((item, index) => (
         <Fragment key={index}>
           <Link href={item.url}>
-            {capitalize(item.text.toLocaleLowerCase())}
+            {capitalize(item.text.toLocaleLowerCase(locale))}
           </Link>
           {index !== list.length - 1 && <Icon name="chevron-end" size={8} />}
         </Fragment>

package/app-template/src/views/category/category-info.tsx

@@ -57,6 +57,7 @@ export default function ListPage(props: ListPageProps) {
       newUrl.searchParams.delete('page');
       router.push(newUrl.pathname + newUrl.search, undefined);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParams, data.products, page]);
 
   const { t } = useLocalization();

package/app-template/src/views/category/filters/index.tsx

@@ -6,7 +6,7 @@ import { useLocalization } from '@akinon/next/hooks';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { resetSelectedFacets } from '@theme/redux/reducers/category';
 import CategoryActiveFilters from '@theme/views/category/category-active-filters';
-import { useMemo, useState, useTransition } from 'react';
+import { useMemo, useTransition } from 'react';
 import { FilterItem } from './filter-item';
 
 interface Props {

package/app-template/src/views/product/product-info.tsx

@@ -41,6 +41,7 @@ export default function ProductInfo({ data }: ProductPageProps) {
     if (isVariantLoading) {
       setProductError(null);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isVariantLoading]);
 
   useEffect(() => {

package/app-template/src/widgets/footer-menu.tsx

@@ -2,6 +2,7 @@ import 'server-only';
 
 import { Link, Accordion } from '@theme/components';
 import { getWidgetData } from '@akinon/next/data/server';
+import { ServerVariables } from '@akinon/next/utils/server-variables';
 
 type SideItem = {
   value: string;
@@ -47,6 +48,7 @@ type FooterMenuType = {
 
 export default async function FooterMenu() {
   const data = await getWidgetData<FooterMenuType>({ slug: 'footer-menu' });
+  const { locale } = ServerVariables;
 
   return (
     <div className="flex-1">
@@ -72,7 +74,7 @@ export default async function FooterMenu() {
                           : '_self'
                       }
                       data-testid={`footer-categories-${item?.value?.name
-                        ?.toLocaleLowerCase()
+                        ?.toLocaleLowerCase(locale)
                         .split(' ')
                         .join('')}`}
                     >
@@ -96,7 +98,9 @@ export default async function FooterMenu() {
                           ? '_blank'
                           : '_self'
                       }
-                      data-testid={`footer-categories-${item?.value?.name?.toLocaleLowerCase()}`}
+                      data-testid={`footer-categories-${item?.value?.name?.toLocaleLowerCase(
+                        locale
+                      )}`}
                     >
                       {item?.value?.name}
                     </Link>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.104.0",
+  "version": "1.105.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {