awing-library 2.1.196-dev → 2.1.198-dev

package/lib/ACM-AXN/Campaign/CreateOrEdit/index.js

@@ -292,7 +292,7 @@ var CreateOrEdit = function (props) {
     };
     var handleSaveProfessionalEditing = function () {
         return new Promise(function (resolve, reject) {
-            confirm(function () { var _a; return (_a = handleSubmit()) === null || _a === void 0 ? void 0 : _a.then(resolve).catch(reject); }, undefined, t("Campaign.SwitchToProfessionalEditMode"));
+            confirm(function () { var _a; return (_a = handleSubmit()) === null || _a === void 0 ? void 0 : _a.then(resolve); }, function () { return reject(); }, t("Campaign.SwitchToProfessionalEditMode"));
         });
     };
     return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: "".concat(t(['Campaign', campaignId ? 'TitleDetail' : 'Create'].join('.'))).concat(campaignId ? ": ".concat((_a = campaignData === null || campaignData === void 0 ? void 0 : campaignData.campaign) === null || _a === void 0 ? void 0 : _a.name) : '', "\n               "), onSubmit: function () { return editModeWizard ? handleSaveProfessionalEditing() : handleSubmit(); }, disableButtonSubmit: handleDisableButtonSubmit(), confirmExit: confirmExit, childrenWrapperStyle: { padding: 0 }, onClose: handleClose, children: (0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, sx: {

package/lib/ACM-AXN/GeoFencing/component.js

@@ -55,6 +55,6 @@ function Component(props) {
                                         }
                                     }, error: !!(radius &&
                                         Number(radius) <
-                                            ((limit === null || limit === void 0 ? void 0 : limit.min) || constants_1.MIN_RADIUS)) }) })] })), (isOnlyMap || showMap) && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, style: { position: "relative", marginTop: "16px" }, children: (0, jsx_runtime_1.jsx)(AWING_1.GoogleMap, { onUpdateLocation: onGoongMapSelect, apiKey: configs.GOOGLE_MAP_KEY, markerPosition: marker || undefined, geofenceRadius: radius ? Number(radius) : 0 }) }))] })] }));
+                                            ((limit === null || limit === void 0 ? void 0 : limit.min) || constants_1.MIN_RADIUS)) }) })] })), (isOnlyMap || showMap) && ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 12, style: { position: "relative", marginTop: "16px" }, children: (0, jsx_runtime_1.jsx)(AWING_1.GoogleMap, { onUpdateLocation: onGoongMapSelect, apiKey: configs.GOOGLE_MAP_KEY, geofenceRadius: radius ? Number(radius) : 0 }) }))] })] }));
 }
 exports.default = Component;

package/lib/AWING/GoogleMap/GGMap.d.ts

@@ -1,3 +1,3 @@
 import { IGoogleMapProps } from './interface';
-declare const GGMap: ({ defaultLocation, onUpdateLocation, apiKey, markerPosition, geofenceRadius, sizeMap, sxMap, isDisplayAutoComplete, isTypeTracking, markerPositions, zoomCustomed }: IGoogleMapProps) => import("react/jsx-runtime").JSX.Element;
+declare const GGMap: ({ defaultLocation, onUpdateLocation, apiKey, geofenceRadius, sizeMap, sxMap, isDisplayAutoComplete, isTypeTracking, markerPositions, zoomCustomed }: IGoogleMapProps) => import("react/jsx-runtime").JSX.Element;
 export default GGMap;

package/lib/AWING/GoogleMap/GGMap.js

@@ -39,13 +39,13 @@ var stylesDefault = {
     }
 };
 var GGMap = function (_a) {
-    var defaultLocation = _a.defaultLocation, onUpdateLocation = _a.onUpdateLocation, apiKey = _a.apiKey, markerPosition = _a.markerPosition, geofenceRadius = _a.geofenceRadius, sizeMap = _a.sizeMap, sxMap = _a.sxMap, _b = _a.isDisplayAutoComplete, isDisplayAutoComplete = _b === void 0 ? false : _b, _c = _a.isTypeTracking, isTypeTracking = _c === void 0 ? false : _c, markerPositions = _a.markerPositions, zoomCustomed = _a.zoomCustomed;
+    var defaultLocation = _a.defaultLocation, onUpdateLocation = _a.onUpdateLocation, apiKey = _a.apiKey, geofenceRadius = _a.geofenceRadius, sizeMap = _a.sizeMap, sxMap = _a.sxMap, _b = _a.isDisplayAutoComplete, isDisplayAutoComplete = _b === void 0 ? false : _b, _c = _a.isTypeTracking, isTypeTracking = _c === void 0 ? false : _c, markerPositions = _a.markerPositions, zoomCustomed = _a.zoomCustomed;
     var t = (0, react_i18next_1.useTranslation)().t;
     var _d = (0, react_1.useState)(), map = _d[0], setMap = _d[1];
     var _e = (0, react_1.useState)(''), error = _e[0], setError = _e[1];
     var autocompleteRef = (0, react_1.useRef)(null);
     var boxRef = (0, react_1.useRef)(null);
-    var _f = (0, react_1.useState)(zoomCustomed || 0), zoom = _f[0], setZoom = _f[1];
+    var _f = (0, react_1.useState)(zoomCustomed || 5), zoom = _f[0], setZoom = _f[1];
     var onLoad = function (autocomplete) {
         autocompleteRef.current = autocomplete;
     };
@@ -64,7 +64,7 @@ var GGMap = function (_a) {
         }, {})) !== null && _a !== void 0 ? _a : {};
         // Convert the object to an array
         return Object.values(coordMap);
-    }, [markerPosition]);
+    }, [markerPositions]);
     var onPlaceChanged = function () {
         var _a, _b, _c, _d;
         if (autocompleteRef.current !== null) {
@@ -130,13 +130,6 @@ var GGMap = function (_a) {
             getCurrentLocation();
         }
     }, [defaultLocation]);
-    var marker = (0, react_1.useMemo)(function () {
-        var _a, _b;
-        return {
-            lat: (_a = Number(markerPosition === null || markerPosition === void 0 ? void 0 : markerPosition.latitude)) !== null && _a !== void 0 ? _a : 0,
-            lng: (_b = Number(markerPosition === null || markerPosition === void 0 ? void 0 : markerPosition.longitude)) !== null && _b !== void 0 ? _b : 0,
-        };
-    }, [markerPosition]);
     var calculateRadius = function (currentZoom) {
         return Math.max(100000 * Math.pow(2, 5 - (currentZoom / 20)), 250);
     };
@@ -165,8 +158,8 @@ var GGMap = function (_a) {
                                 top: '50px',
                             } }) })), (0, jsx_runtime_1.jsx)(api_1.GoogleMap, __assign({ id: "map", mapContainerStyle: sizeMap !== null && sizeMap !== void 0 ? sizeMap : mapContainerStyle, zoom: zoom, onZoomChanged: function () {
                         var _a;
-                        setZoom((_a = map === null || map === void 0 ? void 0 : map.getZoom()) !== null && _a !== void 0 ? _a : 0);
-                    }, center: marker, onLoad: onLoadMap, onClick: onMapClick }, isTypeTracking && {
+                        setZoom((_a = map === null || map === void 0 ? void 0 : map.getZoom()) !== null && _a !== void 0 ? _a : zoom);
+                    }, center: defaultLocation, onLoad: onLoadMap, onClick: onMapClick }, isTypeTracking && {
                     options: {
                         disableDefaultUI: true,
                         styles: utils_1.mapStyles,
@@ -177,7 +170,7 @@ var GGMap = function (_a) {
                         minZoom: 2
                     }
                 }, { children: !markerPositions ?
-                        (0, jsx_runtime_1.jsxs)(material_1.Box, { children: [(0, jsx_runtime_1.jsx)(api_1.Marker, { position: marker }), (0, jsx_runtime_1.jsx)(api_1.Circle, { center: marker, radius: geofenceRadius, options: {
+                        (0, jsx_runtime_1.jsxs)(material_1.Box, { children: [(0, jsx_runtime_1.jsx)(api_1.Marker, { position: defaultLocation !== null && defaultLocation !== void 0 ? defaultLocation : { lat: 21.0063107, lng: 105.8279467 } }), (0, jsx_runtime_1.jsx)(api_1.Circle, { center: defaultLocation, radius: geofenceRadius, options: {
                                         fillColor: 'red',
                                         fillOpacity: 0.2,
                                         strokeColor: 'red',

package/lib/AWING/GoogleMap/interface.d.ts

@@ -4,10 +4,6 @@ export interface IGoogleMapProps {
         lat: number;
         lng: number;
     };
-    markerPosition?: {
-        latitude: number;
-        longitude: number;
-    };
     onUpdateLocation?: (newValue: {
         latitude: number;
         longitude: number;

package/lib/Commons/Components/ClassicDrawer.js

@@ -82,8 +82,9 @@ var Drawer = function (props) {
                 }, 700);
                 closeDrawer((typeof state === 'string' && state) ? state : CloseAction.Reload);
             })
-                .catch(function () {
-                snackbar('error');
+                .catch(function (e) {
+                if (e)
+                    snackbar('error');
             })
                 .finally(function () {
                 setLoading(false);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.196-dev",
+    "version": "2.1.198-dev",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",