@squiz/resource-browser 3.3.1 → 3.3.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 3.3.3
+
+### Patch Changes
+
+-   4bdb412: Add classes to resource picker elements
+-   Updated dependencies [4bdb412]
+    -   @squiz/resource-browser-ui-lib@1.2.3
+
 ## 3.3.1
 
 ### Patch Changes

package/lib/ResourcePicker/ResourcePicker.js

@@ -19,7 +19,7 @@ const ResourcePicker = ({ resource, plugin, allowedTypes, error: externalError,
     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" })),
+        isImagePicker ? (react_1.default.createElement(PhotoLibraryRounded_1.default, { "aria-hidden": true, className: "resource-picker__icon w-6 h-6" })) : (react_1.default.createElement(AdsClickRounded_1.default, { "aria-hidden": true, className: "resource-picker__icon w-6 h-6" })),
         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" },

package/lib/ResourcePicker/States/Error.js

@@ -7,7 +7,7 @@ exports.ErrorState = void 0;
 const react_1 = __importDefault(require("react"));
 const generic_browser_lib_1 = require("@squiz/generic-browser-lib");
 const ErrorState = ({ error, isDisabled, onClear }) => (react_1.default.createElement(react_1.default.Fragment, null,
-    react_1.default.createElement(generic_browser_lib_1.Icon, { icon: 'error', "aria-hidden": true, className: "w-6 h-6 text-red-300" }),
-    react_1.default.createElement("div", { className: "text-red-300 w-full" }, error.message),
+    react_1.default.createElement(generic_browser_lib_1.Icon, { icon: 'error', "aria-hidden": true, className: "resource-picker__error-icon w-6 h-6 text-red-300" }),
+    react_1.default.createElement("div", { className: "resource-picker__error-message text-red-300 w-full" }, error.message),
     react_1.default.createElement(generic_browser_lib_1.ResetButton, { isDisabled: isDisabled, onClick: onClear })));
 exports.ErrorState = ErrorState;

package/lib/ResourcePicker/States/Loading.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadingState = void 0;
 const react_1 = __importDefault(require("react"));
 const generic_browser_lib_1 = require("@squiz/generic-browser-lib");
-const LoadingState = () => (react_1.default.createElement("div", { className: "col-start-2 col-end-2" },
+const LoadingState = () => (react_1.default.createElement("div", { className: "resource-picker__loading col-start-2 col-end-2" },
     react_1.default.createElement(generic_browser_lib_1.Spinner, { label: "Loading selection", className: "m-2" })));
 exports.LoadingState = LoadingState;

package/lib/ResourcePicker/States/Selected.js

@@ -13,14 +13,14 @@ const SelectedState = ({ resource, showThumbnail, icon, label, description, isDi
         isOpen: isModalOpen,
         onOpenChange: onModalStateChange,
     };
-    const replaceAsset = (react_1.default.createElement(resource_browser_ui_lib_1.ModalTrigger, { overlayTriggerState: modalController, showLabel: false, label: "Replace selection", containerClasses: "text-gray-500 hover:text-gray-800 focus:text-gray-800 disabled:text-gray-500 disabled:cursor-not-allowed", icon: react_1.default.createElement(CircledLoopIcon_1.CircledLoopIcon, { "aria-hidden": true, className: "m-1" }), isDisabled: isDisabled, scope: "squiz-rb-scope" }, resourcePickerContainer));
+    const replaceAsset = (react_1.default.createElement(resource_browser_ui_lib_1.ModalTrigger, { overlayTriggerState: modalController, showLabel: false, label: "Replace selection", containerClasses: "selected-resource__replace text-gray-500 hover:text-gray-800 focus:text-gray-800 disabled:text-gray-500 disabled:cursor-not-allowed", icon: react_1.default.createElement(CircledLoopIcon_1.CircledLoopIcon, { "aria-hidden": true, className: "m-1" }), isDisabled: isDisabled, scope: "squiz-rb-scope" }, resourcePickerContainer));
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        showThumbnail && resource.squizImage ? (react_1.default.createElement("div", { className: "checkered-bg w-[56px] h-[56px] overflow-hidden flex justify-center items-center rounded" },
-            react_1.default.createElement("img", { src: resource.squizImage.imageVariations.original.url || resource.url, className: "w-full h-full object-cover object-center", alt: resource.squizImage.name || resource.name }))) : (react_1.default.createElement("div", { className: "w-4 h-4 mt-1 flex self-start overflow-hidden" }, icon)),
-        react_1.default.createElement("div", { className: "justify-self-start self-center w-full overflow-hidden break-words" },
-            label,
+        showThumbnail && resource.squizImage ? (react_1.default.createElement("div", { className: "selected-resource__thumbnail checkered-bg w-[56px] h-[56px] overflow-hidden flex justify-center items-center rounded" },
+            react_1.default.createElement("img", { src: resource.squizImage.imageVariations.original.url || resource.url, className: "w-full h-full object-cover object-center", alt: resource.squizImage.name || resource.name }))) : (react_1.default.createElement("div", { className: "selected-resource__icon w-4 h-5 mt-1 flex self-start overflow-hidden" }, icon)),
+        react_1.default.createElement("div", { className: "selected-resource__info justify-self-start self-center w-full overflow-hidden break-words" },
+            react_1.default.createElement("span", { className: "selected-resource__name" }, label),
             description),
-        react_1.default.createElement("div", { className: "flex" },
+        react_1.default.createElement("div", { className: "selected-resource__actions flex" },
             replaceAsset,
             react_1.default.createElement(generic_browser_lib_1.ResetButton, { isDisabled: isDisabled, onClick: onClear }))));
 };

package/lib/index.css

@@ -5005,6 +5005,9 @@
 .squiz-rb-scope .h-4:not(.squiz-rb-plugin *) {
   height: 1rem;
 }
+.squiz-rb-scope .h-5:not(.squiz-rb-plugin *) {
+  height: 1.25rem;
+}
 .squiz-rb-scope .h-6:not(.squiz-rb-plugin *) {
   height: 1.5rem;
 }
@@ -6050,11 +6053,21 @@
   padding: 0.25rem 0;
   border-bottom: 1px solid #ededed;
 }
-.squiz-rb-scope .searchItem--selected .searchItem__button:not(.squiz-rb-plugin *) {
+.squiz-rb-scope .searchItem.searchItem--selected .searchItem__button:not(.squiz-rb-plugin *) {
   background-color: #e6f1fa;
   border-radius: 0.5rem;
 }
-.squiz-rb-scope .searchItem--selected .searchItem__label:not(.squiz-rb-plugin *) {
+.squiz-rb-scope .searchItem.searchItem--selected .searchItem__label:not(.squiz-rb-plugin *) {
+  color: #044985;
+}
+.squiz-rb-scope .searchItem.searchItem--selected:hover .searchItem__button:not(.squiz-rb-plugin *),
+.squiz-rb-scope .searchItem.searchItem--selected:focus .searchItem__button:not(.squiz-rb-plugin *),
+.squiz-rb-scope .searchItem.searchItem--selected:focus-within .searchItem__button:not(.squiz-rb-plugin *) {
+  background-color: #e6f1fa;
+}
+.squiz-rb-scope .searchItem.searchItem--selected:hover .searchItem__label:not(.squiz-rb-plugin *),
+.squiz-rb-scope .searchItem.searchItem--selected:focus .searchItem__label:not(.squiz-rb-plugin *),
+.squiz-rb-scope .searchItem.searchItem--selected:focus-within .searchItem__label:not(.squiz-rb-plugin *) {
   color: #044985;
 }
 .squiz-rb-scope .searchItem:hover .searchItem__button:not(.squiz-rb-plugin *),
@@ -6105,7 +6118,7 @@
   line-height: 24px;
   text-align: center;
   letter-spacing: -0.4px;
-  color: #707070;
+  color: #949494;
 }
 .squiz-rb-scope .no-search-result-container .no-result-message:not(.squiz-rb-plugin *) {
   margin-top: 1rem;
@@ -6272,6 +6285,74 @@
 .squiz-rb-scope .image-info__loading:not(.squiz-rb-plugin *) {
   margin-top: 80px;
 }
+.squiz-rb-scope .divider:not(.squiz-rb-plugin *) {
+  width: 100%;
+  padding: 0 1.25rem;
+}
+.squiz-rb-scope .empty-wrapper:not(.squiz-rb-plugin *) {
+  align-items: center;
+  color: #707070;
+  display: flex;
+  flex-direction: column;
+}
+.squiz-rb-scope .empty-text:not(.squiz-rb-plugin *) {
+  padding-left: 1.25rem;
+  padding-right: 1.25rem;
+}
+.squiz-rb-scope .empty-text__select:not(.squiz-rb-plugin *) {
+  padding-top: 1.5rem;
+  padding-bottom: 1rem;
+}
+.squiz-rb-scope .empty-text__select svg:not(.squiz-rb-plugin *) {
+  height: 72px;
+  width: 72px;
+}
+.squiz-rb-scope .empty-text__select svg path:not(.squiz-rb-plugin *) {
+  fill: #bababa;
+}
+.squiz-rb-scope .image-info__details-list:not(.squiz-rb-plugin *) {
+  width: 270px;
+  display: flex;
+  flex-direction: column;
+  margin: 1rem 0;
+  width: 100%;
+  padding: 0 1.25rem;
+}
+.squiz-rb-scope .info__details-list:not(.squiz-rb-plugin *) {
+  width: 270px;
+  display: flex;
+  flex-direction: column;
+  margin: 1rem 0;
+  width: 100%;
+  padding: 0 1.25rem;
+}
+.squiz-rb-scope .info__details-item:not(.squiz-rb-plugin *) {
+  display: flex;
+  margin-bottom: 0.5rem;
+  padding-left: 0.25rem;
+}
+.squiz-rb-scope .info__details-label:not(.squiz-rb-plugin *) {
+  color: #707070;
+  width: 60px;
+  display: flex;
+}
+.squiz-rb-scope .info__details-value:not(.squiz-rb-plugin *) {
+  margin-left: 20px;
+  color: #3d3d3d;
+}
+.squiz-rb-scope .info__title:not(.squiz-rb-plugin *) {
+  padding: 0 2.2rem;
+  margin: 1rem 0;
+  color: #3d3d3d;
+}
+.squiz-rb-scope .loader__container:not(.squiz-rb-plugin *) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  width: 100%;
+  color: #949494;
+}
 .squiz-rb-scope .resource-picker:not(.squiz-rb-plugin *) {
   display: grid;
   grid-template-columns: 24px 1fr;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@squiz/resource-browser",
-    "version": "3.3.1",
+    "version": "3.3.3",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "private": false,
@@ -28,7 +28,7 @@
         "@react-types/shared": "^3.23.1",
         "@squiz/dx-json-schema-lib": "^1.67.0",
         "@squiz/generic-browser-lib": "1.67.2",
-        "@squiz/resource-browser-ui-lib": "^1.2.1",
+        "@squiz/resource-browser-ui-lib": "^1.2.3",
         "clsx": "^2.1.0",
         "expiry-map": "^2.0.0",
         "p-memoize": "^4.0.4",

package/src/ResourcePicker/ResourcePicker.tsx

@@ -47,9 +47,9 @@ export const ResourcePicker = ({
     return (
         <div className={clsx('resource-picker', isDisabled && 'resource-picker--disabled')}>
             {isImagePicker ? (
-                <PhotoLibraryRoundedIcon aria-hidden className="w-6 h-6" />
+                <PhotoLibraryRoundedIcon aria-hidden className="resource-picker__icon w-6 h-6" />
             ) : (
-                <AdsClickRoundedIcon aria-hidden className="w-6 h-6" />
+                <AdsClickRoundedIcon aria-hidden className="resource-picker__icon w-6 h-6" />
             )}
             {isOtherSourceValue && (
                 // User is selecting a new image from a different source, render a loading spinner as we can't resolve the value

package/src/ResourcePicker/States/Error.tsx

@@ -9,8 +9,8 @@ export type ErrorStateProps = {
 
 export const ErrorState = ({ error, isDisabled, onClear }: ErrorStateProps) => (
     <>
-        <Icon icon={'error' as IconOptions} aria-hidden className="w-6 h-6 text-red-300" />
-        <div className="text-red-300 w-full">{error.message}</div>
+        <Icon icon={'error' as IconOptions} aria-hidden className="resource-picker__error-icon w-6 h-6 text-red-300" />
+        <div className="resource-picker__error-message text-red-300 w-full">{error.message}</div>
         <ResetButton isDisabled={isDisabled} onClick={onClear} />
     </>
 );

package/src/ResourcePicker/States/Loading.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Spinner } from '@squiz/generic-browser-lib';
 
 export const LoadingState = () => (
-    <div className="col-start-2 col-end-2">
+    <div className="resource-picker__loading col-start-2 col-end-2">
         <Spinner label="Loading selection" className="m-2" />
     </div>
 );

package/src/ResourcePicker/States/Selected.tsx

@@ -39,7 +39,7 @@ export const SelectedState = ({
             overlayTriggerState={modalController}
             showLabel={false}
             label="Replace selection"
-            containerClasses="text-gray-500 hover:text-gray-800 focus:text-gray-800 disabled:text-gray-500 disabled:cursor-not-allowed"
+            containerClasses="selected-resource__replace text-gray-500 hover:text-gray-800 focus:text-gray-800 disabled:text-gray-500 disabled:cursor-not-allowed"
             icon={<CircledLoopIcon aria-hidden className="m-1" />}
             isDisabled={isDisabled}
             scope="squiz-rb-scope"
@@ -52,7 +52,7 @@ export const SelectedState = ({
         <>
             {/* Left column */}
             {showThumbnail && resource.squizImage ? (
-                <div className="checkered-bg w-[56px] h-[56px] overflow-hidden flex justify-center items-center rounded">
+                <div className="selected-resource__thumbnail checkered-bg w-[56px] h-[56px] overflow-hidden flex justify-center items-center rounded">
                     <img
                         src={resource.squizImage.imageVariations.original.url || resource.url}
                         className="w-full h-full object-cover object-center"
@@ -60,15 +60,15 @@ export const SelectedState = ({
                     />
                 </div>
             ) : (
-                <div className="w-4 h-4 mt-1 flex self-start overflow-hidden">{icon}</div>
+                <div className="selected-resource__icon w-4 h-5 mt-1 flex self-start overflow-hidden">{icon}</div>
             )}
             {/* Center columns */}
-            <div className="justify-self-start self-center w-full overflow-hidden break-words">
-                {label}
+            <div className="selected-resource__info justify-self-start self-center w-full overflow-hidden break-words">
+                <span className="selected-resource__name">{label}</span>
                 {description}
             </div>
             {/* End column */}
-            <div className="flex">
+            <div className="selected-resource__actions flex">
                 {replaceAsset}
                 <ResetButton isDisabled={isDisabled} onClick={onClear} />
             </div>

package/src/__mocks__/StorybookHelpers.tsx

@@ -85,26 +85,28 @@ export const createPlugins = (callbackWait: number, headerPortal = false, resour
                     setTimeout(() => {
                         resolve({
                             showThumbnail: resource.squizImage ? true : false,
-                            icon: <Icon icon={resource.type.code} resourceSource="matrix" className="w-4 h-4" />,
+                            icon: <Icon icon={resource.type.code} resourceSource="matrix" className="" />,
                             label: resource.name || resource.squizImage?.name || resource.id,
-                            description: [
-                                <dl
-                                    key="1"
-                                    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 && (
-                                                <>
-                                                    {fileSize} kB , {fileWidth} x {fileHeight}px
-                                                </>
-                                            )}
-                                        </dd>
-                                    </div>
-                                </dl>,
-                            ],
+                            description: resource.squizImage
+                                ? [
+                                      <dl
+                                          key="1"
+                                          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 && (
+                                                      <>
+                                                          {fileSize} kB , {fileWidth} x {fileHeight}px
+                                                      </>
+                                                  )}
+                                              </dd>
+                                          </div>
+                                      </dl>,
+                                  ]
+                                : undefined,
                         });
                     }, callbackWait);
                 });
@@ -121,6 +123,7 @@ export const createPlugins = (callbackWait: number, headerPortal = false, resour
                 }
                 useEffect(() => {
                     if (unresolvedResource !== null) {
+                        const forceType: string = unresolvedResource.forceResourceType;
                         setTimeout(() => {
                             setIsLoading(false);
                             setResource({
@@ -129,23 +132,25 @@ export const createPlugins = (callbackWait: number, headerPortal = false, resour
                                 url: 'https://cdn.mediavalet.com/aunsw/squiz/KfIjcjUJz0O6kWoInBys5A/XpBxg3Hj-0qOXFWnAAWvXQ/Large/RX-7.jpeg',
                                 source: unresolvedResource.source,
                                 type: {
-                                    code: 'jpeg',
+                                    code: forceType ? forceType : 'jpeg',
                                     name: 'JPEG image',
                                 },
-                                squizImage: {
-                                    name: 'An image from Bynder',
-                                    imageVariations: {
-                                        original: {
-                                            width: 1024,
-                                            height: 900,
-                                            url: 'https://cdn.mediavalet.com/aunsw/squiz/KfIjcjUJz0O6kWoInBys5A/XpBxg3Hj-0qOXFWnAAWvXQ/Large/RX-7.jpeg',
-                                            mimeType: 'image/jpeg',
-                                            byteSize: 1068,
-                                            sha1Hash: '',
-                                            aspectRatio: '',
-                                        },
-                                    },
-                                },
+                                squizImage: forceType
+                                    ? undefined
+                                    : {
+                                          name: 'An image from Bynder',
+                                          imageVariations: {
+                                              original: {
+                                                  width: 1024,
+                                                  height: 900,
+                                                  url: 'https://cdn.mediavalet.com/aunsw/squiz/KfIjcjUJz0O6kWoInBys5A/XpBxg3Hj-0qOXFWnAAWvXQ/Large/RX-7.jpeg',
+                                                  mimeType: 'image/jpeg',
+                                                  byteSize: 1068,
+                                                  sha1Hash: '',
+                                                  aspectRatio: '',
+                                              },
+                                          },
+                                      },
                             });
                         }, callbackWait);
                     } else {

package/src/index.stories.tsx

@@ -74,6 +74,16 @@ Selected.args = {
     },
 };
 
+export const SelectedFile = Template.bind({});
+SelectedFile.args = {
+    ...Primary.args,
+    value: {
+        resourceId: '1f7a25b4-380f-4540-9555-8be2dcab4019',
+        sourceId: 'c90feac1-55f3-4e1f-9b56-c22829e3f510',
+        forceResourceType: 'pdf',
+    },
+};
+
 export const ImagesOnly = Template.bind({});
 ImagesOnly.args = {
     ...Primary.args,