update macaw (#925)

.changeset/popular-mayflies-think.md

@@ -0,0 +1,18 @@
+---
+"@saleor/react-hook-form-macaw": patch
+"saleor-app-emails-and-messages": patch
+"saleor-app-data-importer": patch
+"saleor-app-products-feed": patch
+"@saleor/apps-shared": patch
+"saleor-app-invoices": patch
+"saleor-app-klaviyo": patch
+"saleor-app-segment": patch
+"saleor-app-cms-v2": patch
+"saleor-app-search": patch
+"@saleor/apps-ui": patch
+"saleor-app-slack": patch
+"saleor-app-taxes": patch
+"saleor-app-crm": patch
+---
+
+Updated Macaw to pre-127

apps/cms-v2/package.json

@@ -17,7 +17,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "^4.29.19",

apps/crm/package.json

@@ -15,7 +15,7 @@
     "@mailchimp/mailchimp_marketing": "^3.0.80",
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "4.29.19",
     "@trpc/client": "10.34.0",

apps/data-importer/package.json

@@ -17,7 +17,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@sentry/nextjs": "7.55.2",
     "@urql/exchange-auth": "^2.1.4",
     "@vitejs/plugin-react": "4.0.4",

apps/emails-and-messages/package.json

@@ -17,7 +17,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sendgrid/client": "^7.7.0",
     "@sendgrid/mail": "^7.7.0",

apps/invoices/package.json

@@ -15,7 +15,7 @@
     "@hookform/resolvers": "^3.1.0",
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "4.29.19",
     "@trpc/client": "10.34.0",

apps/klaviyo/package.json

@@ -16,7 +16,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@sentry/nextjs": "7.55.2",
     "@urql/exchange-auth": "^2.1.4",
     "graphql": "16.7.1",

apps/products-feed/package.json

@@ -17,7 +17,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "4.29.19",

apps/search/package.json

@@ -16,7 +16,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "4.29.19",

apps/segment/package.json

@@ -16,7 +16,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@segment/analytics-node": "^1.1.0",
     "@sentry/nextjs": "7.55.2",

apps/slack/package.json

@@ -17,7 +17,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sentry/nextjs": "7.55.2",
     "@urql/exchange-auth": "^2.1.4",

apps/taxes/package.json

@@ -16,7 +16,7 @@
     "@saleor/app-sdk": "0.41.1",
     "@saleor/apps-shared": "workspace:*",
     "@saleor/apps-ui": "workspace:*",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@saleor/react-hook-form-macaw": "workspace:*",
     "@sentry/nextjs": "7.55.2",
     "@tanstack/react-query": "4.29.19",

packages/react-hook-form-macaw/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.8",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@storybook/addon-actions": "^7.0.12",
     "@storybook/addon-essentials": "^7.0.12",
     "@storybook/addon-interactions": "^7.0.12",

packages/react-hook-form-macaw/src/components/Combobox.tsx

@@ -5,7 +5,10 @@ import {
 } from "@saleor/macaw-ui/next";
 import { Control, Controller, FieldPath, FieldValues } from "react-hook-form";
 
-export type ComboboxProps<T extends FieldValues = FieldValues> = Omit<$ComboboxProps<T>, "name"> & {
+export type ComboboxProps<T extends FieldValues = FieldValues> = Omit<
+  $ComboboxProps<T, T>,
+  "name"
+> & {
   name: FieldPath<T>;
   control: Control<T>;
   options: Option[];
@@ -30,7 +33,7 @@ export function Combobox<TFieldValues extends FieldValues = FieldValues>({
             {...field}
             options={options}
             onChange={(option) => {
-              onChange(option.value);
+              onChange(option?.value ?? null);
             }}
             value={options.find((o: Option) => o.value === value) || null}
             name={name}

packages/react-hook-form-macaw/src/components/Multiselect.tsx

@@ -6,7 +6,11 @@ import {
 import { Control, Controller, FieldPath, FieldValues } from "react-hook-form";
 
 export type MultiselectProps<T extends FieldValues = FieldValues> = Omit<
-  $MultiselectProps<T>,
+  /*
+   * todo we can go back to string-type value
+   * https://github.com/saleor/macaw-ui/blob/canary/src/components/Combobox/Static/Combobox.tsx#L171
+   */
+  $MultiselectProps<T, T>,
   "name"
 > & {
   name: FieldPath<T>;

packages/react-hook-form-macaw/src/components/Select.tsx

@@ -2,7 +2,7 @@ import { Select as $Select, type SelectProps as $SelectProps, Option } from "@sa
 import { Control, Controller, FieldPath, FieldValues } from "react-hook-form";
 
 export type SelectProps<T extends FieldValues = FieldValues> = Omit<
-  $SelectProps<Option>,
+  $SelectProps<Option, Option>,
   "name"
 > & {
   name: FieldPath<T>;

packages/shared/package.json

@@ -16,7 +16,7 @@
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@saleor/app-sdk": "0.41.1",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "@types/semver": "^7.5.0",

packages/ui/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@saleor/app-sdk": "0.41.1",
-    "@saleor/macaw-ui": "0.8.0-pre.118",
+    "@saleor/macaw-ui": "0.8.0-pre.127",
     "@types/react": "18.2.5",
     "@types/react-dom": "18.2.5",
     "eslint-config-saleor": "workspace:*",