@squiz/resource-browser 3.1.0 → 3.1.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 3.1.2
+
+### Patch Changes
+
+-   c1ebb09: format scope as expected for oAuth calls (space delimited)
+-   213ea12: change plugin render comparison to type not object ref
+
+## 3.1.1
+
+### Patch Changes
+
+-   1ce2636: dont render select preview if switched to different source
+
 ## 3.1.0
 
 ### Patch Changes

package/lib/Hooks/useAuth.js

@@ -19,7 +19,8 @@ const useAuth = (authConfig) => {
             return;
         }
         const encodedRedirectUrl = encodeURIComponent(authConfig.redirectUrl);
-        const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${authConfig?.scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
+        const scope = authConfig?.scope.split(';').join(' '); // Saved in scope1;scope2;scope3 format, sent in scope1 scope2 scope3 format
+        const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
         const popup = window.open(loginUrl, 'Login', 'width=600,height=600');
         if (!popup) {
             console.error('Popup failed to open');

package/lib/Plugin/Plugin.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ResourceBrowserInputProps } from '../ResourceBrowserInput/ResourceBrowserInput';
-import { InlineType } from '../types';
+import { ResourceBrowserPluginType, InlineType } from '../types';
 /**
  *  This plugin component exsits to deal with React rules of Hooks stupidity.
  *
@@ -9,6 +9,7 @@ import { InlineType } from '../types';
  *  needs to render its UI etc.
  */
 export type PluginRenderType = ResourceBrowserInputProps & {
+    type: ResourceBrowserPluginType | null;
     render: boolean;
     inline: boolean;
     inlineType?: InlineType;

package/lib/ResourceBrowserInput/ResourceBrowserInput.d.ts

@@ -1,15 +1,11 @@
 import React from 'react';
-import { ResourceBrowserPlugin, ResourceBrowserSource, ResourceBrowserUnresolvedResource, ResourceBrowserResource, ResourceBrowserSourceWithPlugin, PluginLaunchMode } from '../types';
+import { ResourceBrowserPlugin, ResourceBrowserSource, ResourceBrowserUnresolvedResource, ResourceBrowserResource, ResourceBrowserSourceWithPlugin, PluginLaunchMode, useResolveResourceResponse } from '../types';
 export type ResourceBrowserInputProps = {
     modalTitle: string;
     allowedTypes?: string[];
     isDisabled?: boolean;
     value: ResourceBrowserUnresolvedResource | null;
-    useResource(referenceId: string | null, source: ResourceBrowserSource | null): {
-        data: ResourceBrowserResource | null;
-        error: Error | null;
-        isLoading: boolean;
-    };
+    useResource(referenceId: string | null, source: ResourceBrowserSource | null): useResolveResourceResponse;
     onChange(resource: ResourceBrowserResource | null): void;
     onClear?(): void;
     plugin: ResourceBrowserPlugin | null;
@@ -18,9 +14,10 @@ export type ResourceBrowserInputProps = {
     source: ResourceBrowserSource | null;
     sources: ResourceBrowserSourceWithPlugin[];
     isLoading: boolean;
+    isOtherSourceValue: boolean;
     error: Error | null;
     setSource(source: ResourceBrowserSource, mode?: PluginLaunchMode): void;
     isModalOpen: boolean;
     onModalStateChange(isOpen: boolean): void;
 };
-export declare const ResourceBrowserInput: ({ modalTitle, allowedTypes, onChange, value, useResource, isDisabled, onClear, plugin, pluginMode, searchEnabled, source, sources, isLoading, error, setSource, isModalOpen, onModalStateChange, }: ResourceBrowserInputProps) => React.JSX.Element;
+export declare const ResourceBrowserInput: ({ modalTitle, allowedTypes, onChange, value, useResource, isDisabled, onClear, plugin, pluginMode, searchEnabled, source, sources, isLoading, isOtherSourceValue, error, setSource, isModalOpen, onModalStateChange, }: ResourceBrowserInputProps) => React.JSX.Element;

package/lib/ResourceBrowserInput/ResourceBrowserInput.js

@@ -7,10 +7,10 @@ exports.ResourceBrowserInput = void 0;
 const react_1 = __importDefault(require("react"));
 const MainContainer_1 = __importDefault(require("../MainContainer/MainContainer"));
 const ResourcePicker_1 = require("../ResourcePicker/ResourcePicker");
-const ResourceBrowserInput = ({ modalTitle, allowedTypes, onChange, value, useResource, isDisabled, onClear, plugin, pluginMode, searchEnabled, source, sources, isLoading, error, setSource, isModalOpen, onModalStateChange, }) => {
+const ResourceBrowserInput = ({ modalTitle, allowedTypes, onChange, value, useResource, isDisabled, onClear, plugin, pluginMode, searchEnabled, source, sources, isLoading, isOtherSourceValue, error, setSource, isModalOpen, onModalStateChange, }) => {
     const { data: resource, error: resourceError, isLoading: isResourceLoading } = useResource(value?.resourceId || null, source);
     const defaultOnClear = () => onChange(null);
     const onClearFunction = onClear ?? defaultOnClear;
-    return (react_1.default.createElement(ResourcePicker_1.ResourcePicker, { resource: resource, plugin: plugin, allowedTypes: allowedTypes, error: resourceError || error, isLoading: isResourceLoading || isLoading, isDisabled: isDisabled, onClear: onClearFunction, isModalOpen: isModalOpen, onModalStateChange: onModalStateChange }, (onClose, titleProps) => (react_1.default.createElement(MainContainer_1.default, { selectedSource: source, sources: sources, preselectedResource: resource, plugin: plugin, pluginMode: pluginMode, searchEnabled: searchEnabled, title: modalTitle, titleAriaProps: titleProps, allowedTypes: allowedTypes, onSourceSelect: setSource, onClose: onClose, onChange: onChange }))));
+    return (react_1.default.createElement(ResourcePicker_1.ResourcePicker, { resource: resource, plugin: plugin, allowedTypes: allowedTypes, error: resourceError || error, isLoading: isResourceLoading || isLoading, isOtherSourceValue: isOtherSourceValue, isDisabled: isDisabled, onClear: onClearFunction, isModalOpen: isModalOpen, onModalStateChange: onModalStateChange }, (onClose, titleProps) => (react_1.default.createElement(MainContainer_1.default, { selectedSource: source, sources: sources, preselectedResource: resource, plugin: plugin, pluginMode: pluginMode, searchEnabled: searchEnabled, title: modalTitle, titleAriaProps: titleProps, allowedTypes: allowedTypes, onSourceSelect: setSource, onClose: onClose, onChange: onChange }))));
 };
 exports.ResourceBrowserInput = ResourceBrowserInput;

package/lib/ResourcePicker/ResourcePicker.d.ts

@@ -7,10 +7,11 @@ export type ResourcePickerProps = {
     allowedTypes: string[] | undefined;
     error: Error | null;
     isLoading: boolean;
+    isOtherSourceValue: boolean;
     isDisabled?: boolean;
     children: (onClose: () => void, titleProps: DOMAttributes) => React.ReactElement;
     onClear: () => void;
     isModalOpen: boolean;
     onModalStateChange(isOpen: boolean): void;
 };
-export declare const ResourcePicker: ({ resource, plugin, allowedTypes, error: externalError, isLoading: isExternalLoading, isDisabled, children, onClear, isModalOpen, onModalStateChange, }: ResourcePickerProps) => React.JSX.Element;
+export declare const ResourcePicker: ({ resource, plugin, allowedTypes, error: externalError, isLoading: isExternalLoading, isOtherSourceValue, isDisabled, children, onClear, isModalOpen, onModalStateChange, }: ResourcePickerProps) => React.JSX.Element;

package/lib/ResourcePicker/ResourcePicker.js

@@ -14,16 +14,26 @@ const Loading_1 = require("./States/Loading");
 const Selected_1 = require("./States/Selected");
 const useSelectedState_1 = require("../Hooks/useSelectedState");
 const clsx_1 = __importDefault(require("clsx"));
-const ResourcePicker = ({ resource, plugin, allowedTypes, error: externalError, isLoading: isExternalLoading, isDisabled, children, onClear, isModalOpen, onModalStateChange, }) => {
+const ResourcePicker = ({ resource, plugin, allowedTypes, error: externalError, isLoading: isExternalLoading, isOtherSourceValue, isDisabled, children, onClear, isModalOpen, onModalStateChange, }) => {
     const { data: selectedState, error, isLoading } = (0, useSelectedState_1.useSelectedState)({ resource, plugin });
     const isImagePicker = allowedTypes && allowedTypes.length === 1 && allowedTypes.includes('image');
     const isEmpty = resource === null && !isExternalLoading && !externalError;
     return (react_1.default.createElement("div", { className: (0, clsx_1.default)('resource-picker', isDisabled && 'resource-picker--disabled') },
         isImagePicker ? (react_1.default.createElement(PhotoLibraryRounded_1.default, { "aria-hidden": true, className: "w-6 h-6" })) : (react_1.default.createElement(AdsClickRounded_1.default, { "aria-hidden": true, className: "w-6 h-6" })),
-        isEmpty ? (react_1.default.createElement(resource_browser_ui_lib_1.ModalTrigger, { overlayTriggerState: {
+        isOtherSourceValue && (
+        // User is selecting a new image from a different source, render a loading spinner as we can't resolve the value
+        react_1.default.createElement("div", { className: "resource-picker-info" },
+            react_1.default.createElement("div", { className: "resource-picker-info__layout" },
+                react_1.default.createElement(Loading_1.LoadingState, null),
+                react_1.default.createElement(resource_browser_ui_lib_1.ModalTrigger, { overlayTriggerState: {
+                        isOpen: isModalOpen,
+                        onOpenChange: onModalStateChange,
+                    }, showLabel: false, label: "", isDisabled: true, scope: "squiz-rb-scope" }, children)))),
+        isEmpty && !isOtherSourceValue && (react_1.default.createElement(resource_browser_ui_lib_1.ModalTrigger, { overlayTriggerState: {
                 isOpen: isModalOpen,
                 onOpenChange: onModalStateChange,
-            }, showLabel: true, label: isImagePicker ? `Choose image` : `Choose asset`, icon: react_1.default.createElement(AddCircleOutlineRounded_1.default, { "aria-hidden": true, className: `!w-4 !h-4 text-blue-300 ${isDisabled ? 'text-gray-600' : ''}` }), isDisabled: isDisabled, scope: "squiz-rb-scope" }, children)) : (react_1.default.createElement("div", { className: "resource-picker-info" },
+            }, showLabel: true, label: isImagePicker ? `Choose image` : `Choose asset`, icon: react_1.default.createElement(AddCircleOutlineRounded_1.default, { "aria-hidden": true, className: `!w-4 !h-4 text-blue-300 ${isDisabled ? 'text-gray-600' : ''}` }), isDisabled: isDisabled, scope: "squiz-rb-scope" }, children)),
+        !isEmpty && !isOtherSourceValue && (react_1.default.createElement("div", { className: "resource-picker-info" },
             react_1.default.createElement("div", { className: "resource-picker-info__layout" },
                 (isExternalLoading || isLoading) && react_1.default.createElement(Loading_1.LoadingState, null),
                 (externalError || error) && (react_1.default.createElement(Error_1.ErrorState, { error: externalError || error, isDisabled: isDisabled, onClear: onClear })),

package/lib/index.css

@@ -5727,6 +5727,9 @@
   margin: 0.25rem 0.5rem;
   border-bottom: 1px solid #e0e0e0;
 }
+.squiz-rb-scope .selection-list__item:first-child:not(.squiz-rb-plugin *) {
+  margin-top: 8px;
+}
 .squiz-rb-scope .selection-list__item:last-child:not(.squiz-rb-plugin *) {
   border-bottom: none;
 }
@@ -6164,6 +6167,7 @@
   margin: auto;
 }
 .squiz-rb-scope .image-info__title:not(.squiz-rb-plugin *) {
+  padding: 0 2.2rem;
   margin: 1rem 0;
   color: #3d3d3d;
 }
@@ -6172,6 +6176,7 @@
   color: #707070;
 }
 .squiz-rb-scope .image-info__details-list:not(.squiz-rb-plugin *) {
+  width: 270px;
   display: flex;
   flex-direction: column;
   margin: 1rem 0;
@@ -6186,10 +6191,11 @@
   display: flex;
 }
 .squiz-rb-scope .image-info__details-value:not(.squiz-rb-plugin *) {
+  margin-left: 20px;
   color: #3d3d3d;
 }
 .squiz-rb-scope .image-variant__list:not(.squiz-rb-plugin *) {
-  width: 250px;
+  width: 280px;
   margin-bottom: 1rem;
 }
 .squiz-rb-scope .image-variant__item:not(.squiz-rb-plugin *) {
@@ -6199,6 +6205,9 @@
   width: 100%;
   justify-content: space-between;
 }
+.squiz-rb-scope .selection-list__item:focus-visible:not(.squiz-rb-plugin *) {
+  outline-width: 0px;
+}
 .squiz-rb-scope .selection-list__item--selected .image-variant__checkmark:not(.squiz-rb-plugin *) {
   visibility: visible;
 }
@@ -6253,6 +6262,10 @@
     overflow-y: auto;
   }
 }
+.squiz-rb-scope .divider-container:not(.squiz-rb-plugin *) {
+  padding: 0 1.25rem;
+  width: 100%;
+}
 .squiz-rb-scope .resource-picker:not(.squiz-rb-plugin *) {
   display: grid;
   grid-template-columns: 24px 1fr;

package/lib/index.js

@@ -98,12 +98,19 @@ const ResourceBrowser = (props) => {
     }, [setIsModalOpen]);
     // If the modal closes and we dont have a value clear the source state so it goes back to the launcher on re-open
     (0, react_1.useEffect)(() => {
+        // If modal is closed and we dont have a value
         if (!isModalOpen && !value && (sources?.length > 1 || searchEnabled)) {
             setSource(null);
             setMode(null);
         }
         else if (!isModalOpen) {
+            // Otherwise reset the RB mode
             setMode(null);
+            // If there is a value passed in, reset the source so the preselected asset preview renders correctly
+            if (value && value.sourceId !== source?.id) {
+                const source = sources.find((source) => source.id === value?.sourceId) || null;
+                setSource(source);
+            }
         }
     }, [sources, isModalOpen]);
     // Reset function to allow user manual reload if sources fail in inline usage
@@ -112,7 +119,7 @@ const ResourceBrowser = (props) => {
     }, [reloadSources]);
     // Render a default "plugin" and one for each item in the plugins array. They are conditionally rendered based on what is selected
     return (react_1.default.createElement("div", { className: "squiz-rb-scope" },
-        react_1.default.createElement(Plugin_1.PluginRender, { key: "default", render: plugin === null, inline: !!inline, inlineType: inlineType, ...props, source: source, sources: sources, setSource: handleSourceSelect, isLoading: isLoading, error: sourcesError || error, plugin: plugin, pluginMode: mode, searchEnabled: searchEnabled, useResource: () => {
+        react_1.default.createElement(Plugin_1.PluginRender, { key: "default", type: null, render: plugin === null, inline: !!inline, inlineType: inlineType, ...props, source: source, sources: sources, setSource: handleSourceSelect, isLoading: isLoading, isOtherSourceValue: false, error: sourcesError || error, plugin: plugin, pluginMode: mode, searchEnabled: searchEnabled, useResource: () => {
                 return {
                     data: null,
                     error: null,
@@ -120,7 +127,7 @@ const ResourceBrowser = (props) => {
                 };
             }, isModalOpen: isModalOpen, onModalStateChange: handleModalStateChange, onRetry: handleReset }),
         plugins.map((thisPlugin) => {
-            return (react_1.default.createElement(Plugin_1.PluginRender, { key: thisPlugin.type, render: thisPlugin === plugin, inline: !!inline, inlineType: inlineType, ...props, source: source, sources: sources, setSource: handleSourceSelect, isLoading: isLoading, error: sourcesError || error, plugin: plugin, pluginMode: mode, searchEnabled: searchEnabled, useResource: thisPlugin.useResolveResource, isModalOpen: isModalOpen, onModalStateChange: handleModalStateChange, onRetry: handleReset }));
+            return (react_1.default.createElement(Plugin_1.PluginRender, { key: thisPlugin.type, type: thisPlugin.type, render: thisPlugin.type === plugin?.type, inline: !!inline, inlineType: inlineType, ...props, value: value && source ? (value.sourceId === source.id ? value : null) : null, isOtherSourceValue: value && source ? (value.sourceId !== source.id ? true : false) : false, source: source, sources: sources, setSource: handleSourceSelect, isLoading: isLoading, error: sourcesError || error, plugin: plugin, pluginMode: mode, searchEnabled: searchEnabled, useResource: thisPlugin.useResolveResource, isModalOpen: isModalOpen, onModalStateChange: handleModalStateChange, onRetry: handleReset }));
         })));
 };
 exports.ResourceBrowser = ResourceBrowser;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@squiz/resource-browser",
-    "version": "3.1.0",
+    "version": "3.1.2",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "private": false,

package/src/Hooks/useAuth.spec.tsx

@@ -14,7 +14,7 @@ describe('useAuth', () => {
         authUrl: 'https://auth.example.com',
         clientId: 'example-client-id',
         redirectUrl: 'https://example.com/callback',
-        scope: 'offline_access',
+        scope: 'offline',
     };
 
     beforeEach(() => {
@@ -107,7 +107,7 @@ describe('useAuth', () => {
         result.current.login();
 
         expect(window.open).toHaveBeenCalledWith(
-            `${authConfig.authUrl}?client_id=${authConfig.clientId}&scope=offline_access&redirect_uri=${encodeURIComponent(authConfig.redirectUrl)}&response_type=code&state=state`,
+            `${authConfig.authUrl}?client_id=${authConfig.clientId}&scope=offline&redirect_uri=${encodeURIComponent(authConfig.redirectUrl)}&response_type=code&state=state`,
             'Login',
             'width=600,height=600',
         );
@@ -126,6 +126,50 @@ describe('useAuth', () => {
         expect(popupMock.close).toHaveBeenCalled();
     });
 
+    it('splits the scope from dxp-console and sends in expected format (space delimited)', async () => {
+        jest.useFakeTimers();
+
+        const popupMock = {
+            closed: false,
+            close: jest.fn(),
+        } as unknown as Window;
+
+        jest.spyOn(window, 'open').mockImplementation(() => popupMock);
+        mockGetCookieValue.mockReturnValueOnce(null).mockReturnValueOnce('newAuthToken').mockReturnValueOnce('newRefreshToken');
+
+        const { result } = renderHook(() => useAuth({ ...authConfig, scope: 'offline;asset:read' }));
+
+        result.current.login();
+
+        expect(window.open).toHaveBeenCalledWith(
+            `${authConfig.authUrl}?client_id=${authConfig.clientId}&scope=offline asset:read&redirect_uri=${encodeURIComponent(authConfig.redirectUrl)}&response_type=code&state=state`,
+            'Login',
+            'width=600,height=600',
+        );
+    });
+
+    it('Works with an empty scope', async () => {
+        jest.useFakeTimers();
+
+        const popupMock = {
+            closed: false,
+            close: jest.fn(),
+        } as unknown as Window;
+
+        jest.spyOn(window, 'open').mockImplementation(() => popupMock);
+        mockGetCookieValue.mockReturnValueOnce(null).mockReturnValueOnce('newAuthToken').mockReturnValueOnce('newRefreshToken');
+
+        const { result } = renderHook(() => useAuth({ ...authConfig, scope: '' }));
+
+        result.current.login();
+
+        expect(window.open).toHaveBeenCalledWith(
+            `${authConfig.authUrl}?client_id=${authConfig.clientId}&scope=&redirect_uri=${encodeURIComponent(authConfig.redirectUrl)}&response_type=code&state=state`,
+            'Login',
+            'width=600,height=600',
+        );
+    });
+
     it('should refresh access token and update state', async () => {
         mockGetCookieValue.mockReturnValue('initialRefreshToken');
         mockRefreshAccessToken.mockResolvedValue('newAuthToken');

package/src/Hooks/useAuth.ts

@@ -20,7 +20,8 @@ export const useAuth = (authConfig: AuthenticationConfiguration | undefined) =>
             return;
         }
         const encodedRedirectUrl = encodeURIComponent(authConfig.redirectUrl);
-        const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${authConfig?.scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
+        const scope = authConfig?.scope.split(';').join(' '); // Saved in scope1;scope2;scope3 format, sent in scope1 scope2 scope3 format
+        const loginUrl = `${authConfig?.authUrl}?client_id=${authConfig?.clientId}&scope=${scope}&redirect_uri=${encodedRedirectUrl}&response_type=code&state=state`;
         const popup = window.open(loginUrl, 'Login', 'width=600,height=600');
 
         if (!popup) {

package/src/Plugin/Plugin.spec.tsx

@@ -19,8 +19,10 @@ describe('Plugin', () => {
 
     it('Does render ResourceBrowserInput if render is true', async () => {
         const props = {
+            type: null,
             modalTitle: 'Asset picker',
             value: null,
+            isOtherSourceValue: false,
             onChange: jest.fn(),
             onClear: jest.fn(),
             useResource: () => {
@@ -51,8 +53,10 @@ describe('Plugin', () => {
 
     it('Does render ResourceBrowserInlineButton if inline is true', async () => {
         const props = {
+            type: null,
             modalTitle: 'Asset picker',
             value: null,
+            isOtherSourceValue: false,
             onChange: jest.fn(),
             onClear: jest.fn(),
             useResource: () => {

package/src/Plugin/Plugin.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { ResourceBrowserInput, ResourceBrowserInputProps } from '../ResourceBrowserInput/ResourceBrowserInput';
 import { ResourceBrowserInlineButton } from '../ResourceBrowserInlineButton/ResourceBrowserInlineButton';
 import { AuthProvider } from '../ResourceBrowserContext/AuthProvider';
-import { InlineType } from '../types';
+import { ResourceBrowserPluginType, InlineType } from '../types';
 
 /**
  *  This plugin component exsits to deal with React rules of Hooks stupidity.
@@ -12,6 +12,7 @@ import { InlineType } from '../types';
  *  needs to render its UI etc.
  */
 export type PluginRenderType = ResourceBrowserInputProps & {
+    type: ResourceBrowserPluginType | null;
     render: boolean;
     inline: boolean;
     inlineType?: InlineType;

package/src/ResourceBrowserInput/ResourceBrowserInput.spec.tsx

@@ -22,6 +22,7 @@ describe('Resource browser input', () => {
             <ResourceBrowserInput
                 modalTitle="Asset picker"
                 value={null}
+                isOtherSourceValue={false}
                 useResource={mockUseResource}
                 onChange={mockChange}
                 plugin={null}

package/src/ResourceBrowserInput/ResourceBrowserInput.tsx

@@ -8,6 +8,7 @@ import {
     ResourceBrowserResource,
     ResourceBrowserSourceWithPlugin,
     PluginLaunchMode,
+    useResolveResourceResponse,
 } from '../types';
 
 export type ResourceBrowserInputProps = {
@@ -15,14 +16,7 @@ export type ResourceBrowserInputProps = {
     allowedTypes?: string[];
     isDisabled?: boolean;
     value: ResourceBrowserUnresolvedResource | null;
-    useResource(
-        referenceId: string | null,
-        source: ResourceBrowserSource | null,
-    ): {
-        data: ResourceBrowserResource | null;
-        error: Error | null;
-        isLoading: boolean;
-    };
+    useResource(referenceId: string | null, source: ResourceBrowserSource | null): useResolveResourceResponse;
     onChange(resource: ResourceBrowserResource | null): void;
     onClear?(): void;
     plugin: ResourceBrowserPlugin | null;
@@ -31,6 +25,7 @@ export type ResourceBrowserInputProps = {
     source: ResourceBrowserSource | null;
     sources: ResourceBrowserSourceWithPlugin[];
     isLoading: boolean;
+    isOtherSourceValue: boolean;
     error: Error | null;
     setSource(source: ResourceBrowserSource, mode?: PluginLaunchMode): void;
     isModalOpen: boolean;
@@ -51,6 +46,7 @@ export const ResourceBrowserInput = ({
     source,
     sources,
     isLoading,
+    isOtherSourceValue,
     error,
     setSource,
     isModalOpen,
@@ -68,6 +64,7 @@ export const ResourceBrowserInput = ({
             allowedTypes={allowedTypes}
             error={resourceError || error}
             isLoading={isResourceLoading || isLoading}
+            isOtherSourceValue={isOtherSourceValue}
             isDisabled={isDisabled}
             onClear={onClearFunction}
             isModalOpen={isModalOpen}

package/src/ResourcePicker/ResourcePicker.spec.tsx

@@ -10,6 +10,7 @@ const defaultProps: any = {
     allowedTypes: undefined,
     isLoading: false,
     isError: false,
+    isOtherSourceValue: false,
 };
 
 describe('Resource picker', () => {
@@ -36,6 +37,15 @@ describe('Resource picker', () => {
         expect(loadingLabel).toBeInTheDocument();
     });
 
+    it('should render the loading state if isOtherSourceValue is set to true', () => {
+        render(<ResourcePicker {...defaultProps} isLoading={false} isOtherSourceValue={true} />);
+        const pickerLabel = screen.queryByText('Choose image');
+        const loadingLabel = screen.queryByLabelText('Loading selection');
+
+        expect(pickerLabel).not.toBeInTheDocument();
+        expect(loadingLabel).toBeInTheDocument();
+    });
+
     it('should render the error state if set to true', () => {
         const errorMessage = 'Failed to retrieve asset info due to a Component Service API key problem.';
 

package/src/ResourcePicker/ResourcePicker.tsx

@@ -18,6 +18,7 @@ export type ResourcePickerProps = {
     allowedTypes: string[] | undefined;
     error: Error | null;
     isLoading: boolean;
+    isOtherSourceValue: boolean;
     isDisabled?: boolean;
     children: (onClose: () => void, titleProps: DOMAttributes) => React.ReactElement;
     onClear: () => void;
@@ -31,6 +32,7 @@ export const ResourcePicker = ({
     allowedTypes,
     error: externalError,
     isLoading: isExternalLoading,
+    isOtherSourceValue,
     isDisabled,
     children,
     onClear,
@@ -49,7 +51,28 @@ export const ResourcePicker = ({
             ) : (
                 <AdsClickRoundedIcon aria-hidden className="w-6 h-6" />
             )}
-            {isEmpty ? (
+            {isOtherSourceValue && (
+                // User is selecting a new image from a different source, render a loading spinner as we can't resolve the value
+                <div className="resource-picker-info">
+                    <div className="resource-picker-info__layout">
+                        <LoadingState />
+                        {/* Need to render the ModalTrigger still as it renders the <Modal/> */}
+                        <ModalTrigger
+                            overlayTriggerState={{
+                                isOpen: isModalOpen,
+                                onOpenChange: onModalStateChange,
+                            }}
+                            showLabel={false}
+                            label=""
+                            isDisabled={true}
+                            scope="squiz-rb-scope"
+                        >
+                            {children}
+                        </ModalTrigger>
+                    </div>
+                </div>
+            )}
+            {isEmpty && !isOtherSourceValue && (
                 <ModalTrigger
                     overlayTriggerState={{
                         isOpen: isModalOpen,
@@ -68,7 +91,8 @@ export const ResourcePicker = ({
                 >
                     {children}
                 </ModalTrigger>
-            ) : (
+            )}
+            {!isEmpty && !isOtherSourceValue && (
                 <div className="resource-picker-info">
                     <div className="resource-picker-info__layout">
                         {(isExternalLoading || isLoading) && <LoadingState />}

package/src/__mocks__/StorybookHelpers.tsx

@@ -93,6 +93,7 @@ export const createPlugins = (callbackWait: number, headerPortal = false, resour
                                     className="col-start-2 col-end-2 flex flex-row gap-1 justify-self-start items-center font-normal text-sm"
                                 >
                                     <div>
+                                        <span>{type} plugin</span>
                                         <dt className="hidden">Asset size</dt>
                                         <dd className="text-gray-600">
                                             {resource.squizImage && (
@@ -147,6 +148,9 @@ export const createPlugins = (callbackWait: number, headerPortal = false, resour
                                 },
                             });
                         }, callbackWait);
+                    } else {
+                        setResource(null);
+                        setIsLoading(false);
                     }
                 }, [unresolvedResource, setResource, setIsLoading]);
 

package/src/index.spec.tsx

@@ -8,6 +8,8 @@ import { ResourceBrowserPlugin, ResourceBrowserSource, ResourceBrowserSourceWith
 import * as RBI from './ResourceBrowserInput/ResourceBrowserInput';
 jest.spyOn(RBI, 'ResourceBrowserInput');
 
+import * as Plugin from './Plugin/Plugin';
+
 var useSourceReloadMock = jest.fn();
 jest.mock('./Hooks/useSources', () => {
     const actual = jest.requireActual('./Hooks/useSources');
@@ -45,12 +47,22 @@ describe('Resource browser input', () => {
         renderResourceLauncher: jest.fn(),
     } as unknown as ResourceBrowserPlugin;
 
+    const mockMatrixPlugin = {
+        type: 'matrix',
+        resolveResource: mockResolveResource,
+        renderSelectedResource: mockRenderSelectedResource,
+        sourceBrowserComponent: mockSourceBrowserComponent,
+        useResolveResource: mockUseResolveResource,
+        sourceSearchComponent: jest.fn(),
+        renderResourceLauncher: jest.fn(),
+    } as ResourceBrowserPlugin;
+
     const renderComponent = (props: Partial<ResourceBrowserProps> = {}, searchEnabled?: boolean) => {
         return renderWithContext(
             <ResourceBrowser modalTitle="Asset picker" value={null} onChange={mockChange} onClear={mockOnClear} {...props} />,
             {
                 onRequestSources: mockRequestSources,
-                plugins: [mockDamPlugin],
+                plugins: [mockMatrixPlugin, mockDamPlugin],
                 searchEnabled: !!searchEnabled,
             },
         );
@@ -154,7 +166,7 @@ describe('Resource browser input', () => {
         });
     });
 
-    it('onSourceSelect will set mode is provided', async () => {
+    it('onSourceSelect will set mode if provided', async () => {
         const sourcesInput = [mockSource({ type: 'dam' }), mockSource()];
         const calculatedSources = sourcesInput.map((source) => calculateExpectedSource(source));
         mockRequestSources.mockResolvedValueOnce(sourcesInput);
@@ -214,6 +226,49 @@ describe('Resource browser input', () => {
         });
     });
 
+    it('Value will only be passed to ResourceBrowserInput if value source matches currently selected source', async () => {
+        const sourcesInput = [mockSource({ id: '1' }), mockSource({ id: '2' })];
+        const calculatedSources = sourcesInput.map((source) => calculateExpectedSource(source));
+        mockRequestSources.mockResolvedValueOnce(sourcesInput);
+
+        const value = { sourceId: sourcesInput[0].id, resourceId: '123456' };
+
+        renderComponent({ value });
+
+        await waitFor(() => {
+            expect(RBI.ResourceBrowserInput).toHaveBeenLastCalledWith(
+                expect.objectContaining({
+                    value,
+                    isOtherSourceValue: false,
+                    source: calculatedSources[0],
+                }),
+                {},
+            );
+        });
+
+        const { onModalStateChange, setSource } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+        // Invoke open the modal
+        act(() => {
+            onModalStateChange(true);
+        });
+
+        // Change the source
+        act(() => {
+            setSource(calculatedSources[1]);
+        });
+
+        await waitFor(() => {
+            expect(RBI.ResourceBrowserInput).toHaveBeenLastCalledWith(
+                expect.objectContaining({
+                    value: null,
+                    isOtherSourceValue: true,
+                    source: calculatedSources[1],
+                }),
+                {},
+            );
+        });
+    });
+
     it('onModalStateChange called with false will reset the Source and Plugin', async () => {
         const sourcesInput = [mockSource({ type: 'dam' }), mockSource()];
         const calculatedSources = sourcesInput.map((source) => calculateExpectedSource(source));
@@ -252,7 +307,13 @@ describe('Resource browser input', () => {
 
         // Invoke modal close callback
         const { onModalStateChange } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
-        onModalStateChange(false);
+        // Invoke open and close the modal
+        act(() => {
+            onModalStateChange(true);
+        });
+        act(() => {
+            onModalStateChange(false);
+        });
 
         // Expect no source or plugin
         await waitFor(() => {
@@ -286,6 +347,9 @@ describe('Resource browser input', () => {
 
         // Invoke modal close callback
         const { onModalStateChange } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+        act(() => {
+            onModalStateChange(true);
+        });
         act(() => {
             onModalStateChange(false);
         });
@@ -339,7 +403,13 @@ describe('Resource browser input', () => {
 
         // Invoke modal close callback
         const { onModalStateChange } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
-        onModalStateChange(false);
+        // Invoke open and close the modal
+        act(() => {
+            onModalStateChange(true);
+        });
+        act(() => {
+            onModalStateChange(false);
+        });
 
         // Expect no source or plugin
         await waitFor(() => {
@@ -355,8 +425,8 @@ describe('Resource browser input', () => {
         });
     });
 
-    it('onModalStateChange called with false will not reset the Source and Plugin if a value exists', async () => {
-        const sourcesInput = [mockSource({ type: 'dam' }), mockSource()];
+    it('onModalStateChange called with false will reset the Source and Plugin to the value defaults if a value exists', async () => {
+        const sourcesInput = [mockSource({ id: '1' }), mockSource({ id: '2' })];
         const calculatedSources = sourcesInput.map((source) => calculateExpectedSource(source));
         mockRequestSources.mockResolvedValueOnce(sourcesInput);
 
@@ -373,8 +443,27 @@ describe('Resource browser input', () => {
             );
         });
 
-        // Invoke modal close callback
-        const { onModalStateChange } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+        const { onModalStateChange, setSource } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+        // Invoke open and close the modal
+        act(() => {
+            onModalStateChange(true);
+        });
+
+        // Change the source
+        act(() => {
+            setSource(calculatedSources[1]);
+        });
+
+        await waitFor(() => {
+            expect(RBI.ResourceBrowserInput).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    source: calculatedSources[1],
+                    plugin: mockDamPlugin,
+                }),
+                {},
+            );
+        });
+
         act(() => {
             onModalStateChange(false);
         });
@@ -411,6 +500,9 @@ describe('Resource browser input', () => {
 
         // Invoke modal close callback
         const { onModalStateChange } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+        act(() => {
+            onModalStateChange(true);
+        });
         act(() => {
             onModalStateChange(false);
         });
@@ -444,4 +536,135 @@ describe('Resource browser input', () => {
             expect(useSourceReloadMock).toHaveBeenCalled();
         });
     });
+
+    describe('Resource browser plugin', () => {
+        beforeEach(() => {
+            jest.spyOn(Plugin, 'PluginRender');
+        });
+        afterEach(() => {
+            (Plugin.PluginRender as jest.Mock).mockRestore();
+        });
+
+        it('Will default to a non plugin based render for initial load and selection of first source', async () => {
+            const sourcesInput = [mockSource({ type: 'dam' }), mockSource({ type: 'matrix' })];
+            mockRequestSources.mockResolvedValue(sourcesInput);
+            renderComponent();
+
+            // Will render a default with no selected source
+            await waitFor(() => {
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: true,
+                        type: null,
+                        plugin: null,
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: false,
+                        type: 'dam',
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: false,
+                        type: 'matrix',
+                    }),
+                    {},
+                );
+            });
+        });
+
+        it('Will only send render=true to the Plugin for the currently selected source', async () => {
+            const sourcesInput = [mockSource({ type: 'dam' }), mockSource({ type: 'matrix' })];
+            mockRequestSources.mockResolvedValue(sourcesInput);
+
+            // Render with an input so it will default a source
+            renderComponent({ value: { sourceId: sourcesInput[0].id, resourceId: '123456' } });
+
+            // Will render a default with no selected source
+            await waitFor(() => {
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: false,
+                        type: null,
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: true,
+                        type: 'dam',
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: false,
+                        type: 'matrix',
+                    }),
+                    {},
+                );
+            });
+
+            // renderComponent({ value: { sourceId: sourcesInput[0].id, resourceId: '123456' } });
+        });
+
+        it('Will match plugin to render based on type', async () => {
+            const sourcesInput = [mockSource({ type: 'dam' }), mockSource({ type: 'matrix' })];
+            const calculatedSources = sourcesInput.map((source) => calculateExpectedSource(source));
+            mockRequestSources.mockResolvedValue(sourcesInput);
+            renderComponent();
+
+            // Modify the source so the plugin object comparison doesnt match
+            calculatedSources[0] = {
+                ...calculatedSources[0],
+                plugin: {
+                    // @ts-ignore
+                    test: 'test',
+                    ...calculatedSources[0].plugin,
+                },
+            };
+
+            // Get the provided callback
+            const { setSource } = (RBI.ResourceBrowserInput as unknown as jest.SpyInstance).mock.calls[0][0];
+            // Invoke it
+            act(() => {
+                setSource(calculatedSources[0]);
+            });
+
+            // Will render a default with no selected source
+            await waitFor(() => {
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: true,
+                        type: null,
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: true,
+                        type: 'dam',
+                    }),
+                    {},
+                );
+
+                expect(Plugin.PluginRender).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        render: false,
+                        type: 'matrix',
+                    }),
+                    {},
+                );
+            });
+        });
+    });
 });

package/src/index.tsx

@@ -103,11 +103,19 @@ export const ResourceBrowser = (props: ResourceBrowserProps) => {
 
     // If the modal closes and we dont have a value clear the source state so it goes back to the launcher on re-open
     useEffect(() => {
+        // If modal is closed and we dont have a value
         if (!isModalOpen && !value && (sources?.length > 1 || searchEnabled)) {
             setSource(null);
             setMode(null);
         } else if (!isModalOpen) {
+            // Otherwise reset the RB mode
             setMode(null);
+
+            // If there is a value passed in, reset the source so the preselected asset preview renders correctly
+            if (value && value.sourceId !== source?.id) {
+                const source = sources.find((source) => source.id === value?.sourceId) || null;
+                setSource(source);
+            }
         }
     }, [sources, isModalOpen]);
 
@@ -121,6 +129,7 @@ export const ResourceBrowser = (props: ResourceBrowserProps) => {
         <div className="squiz-rb-scope">
             <PluginRender
                 key="default"
+                type={null}
                 render={plugin === null}
                 inline={!!inline}
                 inlineType={inlineType}
@@ -129,6 +138,7 @@ export const ResourceBrowser = (props: ResourceBrowserProps) => {
                 sources={sources}
                 setSource={handleSourceSelect}
                 isLoading={isLoading}
+                isOtherSourceValue={false}
                 error={sourcesError || error}
                 plugin={plugin}
                 pluginMode={mode}
@@ -148,10 +158,13 @@ export const ResourceBrowser = (props: ResourceBrowserProps) => {
                 return (
                     <PluginRender
                         key={thisPlugin.type}
-                        render={thisPlugin === plugin}
+                        type={thisPlugin.type}
+                        render={thisPlugin.type === plugin?.type}
                         inline={!!inline}
                         inlineType={inlineType}
                         {...props}
+                        value={value && source ? (value.sourceId === source.id ? value : null) : null} // Don't pass value if value isn't for selected source
+                        isOtherSourceValue={value && source ? (value.sourceId !== source.id ? true : false) : false} // Block render of existing asset if not from this source
                         source={source}
                         sources={sources}
                         setSource={handleSourceSelect}