@ikas/storefront 0.1.15 → 0.1.18

package/build/components/checkout/components/form-item/model.d.ts

@@ -35,6 +35,7 @@ export interface Props {
     autocomplete?: string;
     tooltipText?: string;
     country?: string | null;
+    currentCountryCode?: string | null;
     style?: React.CSSProperties;
     textAreaPlaceholder?: string | null;
     rightContent?: React.ReactElement | null;

package/build/index.es.js

@@ -39381,6 +39381,8 @@ var PhoneRule = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
+                if (!this.value)
+                    return [2 /*return*/, true];
                 result = this.value.match(/\d/g);
                 return [2 /*return*/, ((!!result && result.length <= 11) || !!/^\+(\d{12})$/gm.test(this.value))];
             });
@@ -68372,10 +68374,8 @@ function (_React$Component) {
 }), _defineProperty$a(_class2, "supportedWrappers", ['div', 'span']), _defineProperty$a(_class2, "displayName", 'ReactTooltip'), _temp)) || _class) || _class) || _class) || _class) || _class) || _class) || _class;
 
 var FormItem = observer(function (props) {
-    var _a;
     var t = useTranslation().t;
-    var _b = useState(function () { return new FormItemViewModel(props); }), vm = _b[0], setVM = _b[1];
-    var store = IkasStorefrontConfig.store;
+    var _a = useState(function () { return new FormItemViewModel(props); }), vm = _a[0], setVM = _a[1];
     useEffect(function () {
         ReactTooltip.rebuild();
     }, []);
@@ -68440,18 +68440,15 @@ var FormItem = observer(function (props) {
         });
     }, [props.onChange]);
     useEffect(function () {
-        vm.country = store.currentCountryCode;
-    }, [store.currentCountryCode]);
-    var currentRouting = IkasStorefrontConfig.routings.find(function (r) { return r.id === IkasStorefrontConfig.storefrontRoutingId; });
+        if (!vm.country && props.currentCountryCode)
+            vm.onPhoneChange(props.currentCountryCode);
+    }, [props.currentCountryCode]);
     return (createElement("div", { className: vm.formItemStyle, style: props.style },
         createElement("div", { className: styles.FormItemWrapper },
             createElement("div", { className: styles.FormItemInputWrapper },
                 createElement("label", { className: vm.labelStyle }, vm.label),
                 vm.type === FormItemType.TEXT && (createElement(Input$2, { vm: vm, autocomplete: props.autocomplete, name: props.name })),
-                vm.type === FormItemType.TEL && (createElement(PhoneInput, { defaultCountry: vm.country ||
-                        (!!((_a = currentRouting === null || currentRouting === void 0 ? void 0 : currentRouting.countryCodes) === null || _a === void 0 ? void 0 : _a.length)
-                            ? currentRouting.countryCodes[0]
-                            : "TR"), placeholder: t("checkout-page:enterPhoneNumber"), value: vm.value ? vm.value : "", onChange: vm.onPhoneChange, international: true, addInternationalOption: false })),
+                vm.type === FormItemType.TEL && (createElement(PhoneInput, { defaultCountry: props.currentCountryCode, placeholder: t("checkout-page:enterPhoneNumber"), value: vm.value ? vm.value : "", onChange: vm.onPhoneChange, international: true, addInternationalOption: false })),
                 vm.type === FormItemType.TEXT_AREA && createElement(TextArea, { vm: vm }),
                 vm.type === FormItemType.SELECT && (createElement(Select, { vm: vm, autocomplete: props.autocomplete }))),
             !!vm.hasError && (createElement("div", { className: styles.ErrorMsg }, vm.errorText || "")),
@@ -69204,7 +69201,7 @@ var Phone = observer(function (_a) {
     var _b;
     var vm = _a.vm;
     var t = useTranslation().t;
-    return (createElement(FormItem, { type: FormItemType.TEL, inputType: FormItemInputType.TEL, label: t("checkout-page:phone"), autocomplete: "tel", value: vm.phone || "", onChange: vm.onPhoneChange, hasError: vm.isErrorsVisible && !((_b = vm.address.validationResult) === null || _b === void 0 ? void 0 : _b.phone), errorText: t("checkout-page:phoneError") }));
+    return (createElement(FormItem, { type: FormItemType.TEL, inputType: FormItemInputType.TEL, label: t("checkout-page:phone"), autocomplete: "tel", value: vm.phone || "", onChange: vm.onPhoneChange, hasError: vm.isErrorsVisible && !((_b = vm.address.validationResult) === null || _b === void 0 ? void 0 : _b.phone), currentCountryCode: vm.myCountryCode, errorText: t("checkout-page:phoneError") }));
 });
 var Company = observer(function (_a) {
     var vm = _a.vm;

package/build/index.js

@@ -39360,6 +39360,8 @@ var PhoneRule = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
+                if (!this.value)
+                    return [2 /*return*/, true];
                 result = this.value.match(/\d/g);
                 return [2 /*return*/, ((!!result && result.length <= 11) || !!/^\+(\d{12})$/gm.test(this.value))];
             });
@@ -68351,10 +68353,8 @@ function (_React$Component) {
 }), _defineProperty$a(_class2, "supportedWrappers", ['div', 'span']), _defineProperty$a(_class2, "displayName", 'ReactTooltip'), _temp)) || _class) || _class) || _class) || _class) || _class) || _class) || _class;
 
 var FormItem = mobxReactLite.observer(function (props) {
-    var _a;
     var t = useTranslation().t;
-    var _b = React.useState(function () { return new FormItemViewModel(props); }), vm = _b[0], setVM = _b[1];
-    var store = IkasStorefrontConfig.store;
+    var _a = React.useState(function () { return new FormItemViewModel(props); }), vm = _a[0], setVM = _a[1];
     React.useEffect(function () {
         ReactTooltip.rebuild();
     }, []);
@@ -68419,18 +68419,15 @@ var FormItem = mobxReactLite.observer(function (props) {
         });
     }, [props.onChange]);
     React.useEffect(function () {
-        vm.country = store.currentCountryCode;
-    }, [store.currentCountryCode]);
-    var currentRouting = IkasStorefrontConfig.routings.find(function (r) { return r.id === IkasStorefrontConfig.storefrontRoutingId; });
+        if (!vm.country && props.currentCountryCode)
+            vm.onPhoneChange(props.currentCountryCode);
+    }, [props.currentCountryCode]);
     return (React.createElement("div", { className: vm.formItemStyle, style: props.style },
         React.createElement("div", { className: styles.FormItemWrapper },
             React.createElement("div", { className: styles.FormItemInputWrapper },
                 React.createElement("label", { className: vm.labelStyle }, vm.label),
                 vm.type === FormItemType.TEXT && (React.createElement(Input$2, { vm: vm, autocomplete: props.autocomplete, name: props.name })),
-                vm.type === FormItemType.TEL && (React.createElement(PhoneInput, { defaultCountry: vm.country ||
-                        (!!((_a = currentRouting === null || currentRouting === void 0 ? void 0 : currentRouting.countryCodes) === null || _a === void 0 ? void 0 : _a.length)
-                            ? currentRouting.countryCodes[0]
-                            : "TR"), placeholder: t("checkout-page:enterPhoneNumber"), value: vm.value ? vm.value : "", onChange: vm.onPhoneChange, international: true, addInternationalOption: false })),
+                vm.type === FormItemType.TEL && (React.createElement(PhoneInput, { defaultCountry: props.currentCountryCode, placeholder: t("checkout-page:enterPhoneNumber"), value: vm.value ? vm.value : "", onChange: vm.onPhoneChange, international: true, addInternationalOption: false })),
                 vm.type === FormItemType.TEXT_AREA && React.createElement(TextArea, { vm: vm }),
                 vm.type === FormItemType.SELECT && (React.createElement(Select, { vm: vm, autocomplete: props.autocomplete }))),
             !!vm.hasError && (React.createElement("div", { className: styles.ErrorMsg }, vm.errorText || "")),
@@ -69183,7 +69180,7 @@ var Phone = mobxReactLite.observer(function (_a) {
     var _b;
     var vm = _a.vm;
     var t = useTranslation().t;
-    return (React.createElement(FormItem, { type: FormItemType.TEL, inputType: FormItemInputType.TEL, label: t("checkout-page:phone"), autocomplete: "tel", value: vm.phone || "", onChange: vm.onPhoneChange, hasError: vm.isErrorsVisible && !((_b = vm.address.validationResult) === null || _b === void 0 ? void 0 : _b.phone), errorText: t("checkout-page:phoneError") }));
+    return (React.createElement(FormItem, { type: FormItemType.TEL, inputType: FormItemInputType.TEL, label: t("checkout-page:phone"), autocomplete: "tel", value: vm.phone || "", onChange: vm.onPhoneChange, hasError: vm.isErrorsVisible && !((_b = vm.address.validationResult) === null || _b === void 0 ? void 0 : _b.phone), currentCountryCode: vm.myCountryCode, errorText: t("checkout-page:phoneError") }));
 });
 var Company = mobxReactLite.observer(function (_a) {
     var vm = _a.vm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "0.1.15",
+  "version": "0.1.18",
   "main": "./build/index.js",
   "module": "./build/index.es.js",
   "author": "Umut Ozan Yıldırım",