@bindu-dashing/dam-solution-v2 5.8.7 → 5.8.8

package/build/ImagePicker/index.d.ts

@@ -8,6 +8,6 @@ declare function App(props: {
     id: string;
     onSelect?: (url: string, value: any) => void;
     url?: string;
-    routerVersion: 4 | 5 | 6;
+    routerVersion?: 4 | 5 | 6;
 }): JSX.Element;
 export default App;

package/build/ImagePicker/index.js

@@ -1,12 +1,29 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DamConfigProvider } from "../hocs/DamConfigContext";
 import { ThemeProvider } from "../hocs/ThemeContext";
 import { ThemeModes } from "../utilities/constants/interface";
 import AppProvider from "../hocs/AppProvider";
 import ToastProvider from "../hocs/ToastProvider";
-import { MemoryRouter } from "react-router-dom";
+import { MemoryRouter, useInRouterContext } from "react-router-dom";
 import AppRoutes from "./routes";
 import process from "process";
+// Wrapper component to conditionally use MemoryRouter
+function RouterWrapper({ children, appType }) {
+    // Always call hooks at the top level
+    const isInsideRouter = useInRouterContext();
+    // If appType is provided, it means we're embedding in an existing app with its own router
+    // Always skip MemoryRouter in this case to avoid nested Router errors
+    if (appType) {
+        // Already inside a router (indicated by appType), don't create another one
+        return _jsx(_Fragment, { children: children });
+    }
+    // If we're already in a router context, don't create another one
+    if (isInsideRouter) {
+        return _jsx(_Fragment, { children: children });
+    }
+    // Not inside a router, create MemoryRouter
+    return _jsx(MemoryRouter, { initialEntries: ["/"], children: children });
+}
 function App(props) {
     const config = {
         damAccessKey: props === null || props === void 0 ? void 0 : props.accessKey,
@@ -19,6 +36,6 @@ function App(props) {
     if (typeof window !== "undefined" && !window.process) {
         window.process = process;
     }
-    return (_jsx(DamConfigProvider, { config: config, children: _jsx(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: _jsxs(AppProvider, { children: [_jsx(MemoryRouter, { initialEntries: ["/"], children: _jsx(AppRoutes, { id: props.id, onSelect: props === null || props === void 0 ? void 0 : props.onSelect, url: props === null || props === void 0 ? void 0 : props.url, routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) }), _jsx(ToastProvider, {})] }) }) }));
+    return (_jsx(DamConfigProvider, { config: config, children: _jsx(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: _jsxs(AppProvider, { children: [_jsx(RouterWrapper, { appType: props === null || props === void 0 ? void 0 : props.appType, children: _jsx(AppRoutes, { id: props.id, onSelect: props === null || props === void 0 ? void 0 : props.onSelect, url: props === null || props === void 0 ? void 0 : props.url, routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) }), _jsx(ToastProvider, {})] }) }) }));
 }
 export default App;

package/build/ImagePickerFilters/index.js

@@ -14,6 +14,7 @@ function App(props) {
         styles: props === null || props === void 0 ? void 0 : props.styles,
         appType: props === null || props === void 0 ? void 0 : props.appType,
     };
+    console.log("id", props.id);
     return (_jsx(DamConfigProvider, { config: config, children: _jsx(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: _jsxs(AppProvider, { children: [_jsx(ImagePickerFiltersComponent, { id: props.id, onSelect: props === null || props === void 0 ? void 0 : props.onSelect, url: props === null || props === void 0 ? void 0 : props.url }), _jsx(ToastProvider, {})] }) }) }));
 }
 export default App;

package/build/hocs/DamConfigContext.js

@@ -31,7 +31,6 @@ export const DamConfigProvider = ({ children, config }) => {
     const getToken = () => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
         setLoading(true);
-        console.log("getToken", getBaseUrl(appType), appType);
         try {
             const response = yield axios.post(getBaseUrl(appType) + USER_LOGIN, {
                 accessKey: damAccessKey,

package/build/react-query/services/image-picker-services.js

@@ -16,7 +16,6 @@ import { useInfiniteQuery } from "react-query";
 function fetchPickers(api, params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            console.log("fetchPickers", `${FETCH_IMAGEPICKERS_URL}?${addQueryParams(params)}`);
             const response = yield api.get(`${FETCH_IMAGEPICKERS_URL}?${addQueryParams(params)}`);
             return get(response, "data");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.7",
+  "version": "5.8.8",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",