@squiz/resource-browser 1.64.1 → 1.66.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @squiz/resource-browser
 
+## 1.66.0
+
+### Minor Changes
+
+- 5032c38: Added content page asset icon.
+
+### Patch Changes
+
+- Updated dependencies [5032c38]
+  - @squiz/generic-browser-lib@1.65.0
+
+## 1.65.0
+
+### Minor Changes
+
+- ac68ec6: Unpinned Squiz dependencies, they should now be following semver.
+
+### Patch Changes
+
+- Updated dependencies [ac68ec6]
+  - @squiz/dx-json-schema-lib@1.65.0
+
 ## 1.64.1
 
 ### Patch Changes

package/lib/PreviewPanel/details/MatrixResource.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 import { Resource } from '../../types';
 type MatrixResourceProps = {
     resource: Resource;
 };
-declare const MatrixResource: ({ resource: { id, type, name, status } }: MatrixResourceProps) => JSX.Element;
+declare const MatrixResource: ({ resource: { id, type, name, status } }: MatrixResourceProps) => React.JSX.Element;
 export default MatrixResource;

package/lib/ResourceBreadcrumb/ResourceBreadcrumb.d.ts

@@ -1,8 +1,9 @@
+import React from 'react';
 import { Hierarchy } from '../types';
 export interface ResourceBreadcrumbProps<T> {
     hierarchy: Hierarchy<T>;
     onBreadcrumbSelect: (node: T) => void;
     onReturnToRoot: () => void;
 }
-declare const ResourceBreadcrumb: <T>({ hierarchy, onBreadcrumbSelect, onReturnToRoot }: ResourceBreadcrumbProps<T>) => JSX.Element;
+declare const ResourceBreadcrumb: <T>({ hierarchy, onBreadcrumbSelect, onReturnToRoot }: ResourceBreadcrumbProps<T>) => React.JSX.Element;
 export default ResourceBreadcrumb;

package/lib/ResourceList/ResourceList.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { OverlayTriggerState } from 'react-stately';
 import { DOMAttributes, FocusableElement } from '@react-types/shared';
 import { Resource } from '../types';
@@ -13,5 +14,5 @@ export interface ResourceListProps {
     handleReload: () => void;
     error: Error | null;
 }
-declare const ResourceList: ({ resources, selectedResource, previewModalState, isLoading, onResourceSelect, onResourceDrillDown, allowedTypes, handleReturnToRoot, handleReload, error, }: ResourceListProps) => JSX.Element;
+declare const ResourceList: ({ resources, selectedResource, previewModalState, isLoading, onResourceSelect, onResourceDrillDown, allowedTypes, handleReturnToRoot, handleReload, error, }: ResourceListProps) => React.JSX.Element;
 export default ResourceList;

package/lib/ResourcePicker/ResourcePicker.d.ts

@@ -10,5 +10,5 @@ export type ResourcePickerProps = {
     children: (onClose: () => void, titleProps: DOMAttributes) => React.ReactElement;
     onClear: () => void;
 };
-declare const ResourcePicker: ({ resource, allowedTypes, error, isLoading, isDisabled, children, onClear, }: ResourcePickerProps) => JSX.Element;
+declare const ResourcePicker: ({ resource, allowedTypes, error, isLoading, isDisabled, children, onClear, }: ResourcePickerProps) => React.JSX.Element;
 export default ResourcePicker;

package/lib/ResourcePicker/States/Error.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 export type ErrorStateProps = {
     error: Error;
     isDisabled?: boolean;
     onClear: () => void;
 };
-export declare const ErrorState: ({ error, isDisabled, onClear }: ErrorStateProps) => JSX.Element;
+export declare const ErrorState: ({ error, isDisabled, onClear }: ErrorStateProps) => React.JSX.Element;

package/lib/ResourcePicker/States/Loading.d.ts

@@ -1 +1,2 @@
-export declare const LoadingState: () => JSX.Element;
+import React from 'react';
+export declare const LoadingState: () => React.JSX.Element;

package/lib/ResourcePicker/States/Selected.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { Resource } from '../../types';
 export type SelectedStateProps = {
     resource: Resource;
     isDisabled?: boolean;
     onClear: () => void;
 };
-export declare const SelectedState: ({ resource: { id, type, name, status, squizImage }, isDisabled, onClear, }: SelectedStateProps) => JSX.Element;
+export declare const SelectedState: ({ resource: { id, type, name, status, squizImage }, isDisabled, onClear, }: SelectedStateProps) => React.JSX.Element;

package/lib/ResourcePickerContainer/ResourcePickerContainer.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { DOMAttributes, FocusableElement } from '@react-types/shared';
 import { Source, Resource, HydratedResourceReference } from '../types';
 interface ResourcePickerContainerProps {
@@ -9,5 +10,5 @@ interface ResourcePickerContainerProps {
     onChange(resource: HydratedResourceReference | null): void;
     onClose: () => void;
 }
-declare function ResourcePickerContainer({ title, titleAriaProps, allowedTypes, onRequestSources, onRequestChildren, onChange, onClose, }: ResourcePickerContainerProps): JSX.Element;
+declare function ResourcePickerContainer({ title, titleAriaProps, allowedTypes, onRequestSources, onRequestChildren, onChange, onClose, }: ResourcePickerContainerProps): React.JSX.Element;
 export default ResourcePickerContainer;

package/lib/SourceDropdown/SourceDropdown.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { Source, ScopedSource } from '../types';
 export default function SourceDropdown({ sources, selectedSource, isLoading, onRootSelect, onSourceSelect, }: {
     sources: Source[];
@@ -5,4 +6,4 @@ export default function SourceDropdown({ sources, selectedSource, isLoading, onR
     isLoading: boolean;
     onRootSelect: () => void;
     onSourceSelect: (source: ScopedSource) => void;
-}): JSX.Element;
+}): React.JSX.Element;

package/lib/SourceList/SourceList.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { OverlayTriggerState } from 'react-stately';
 import { DOMAttributes, FocusableElement } from '@react-types/shared';
 import { Source, ScopedSource } from '../types';
@@ -9,5 +10,5 @@ export interface SourceListProps {
     handleReload: () => void;
     error: Error | null;
 }
-declare const SourceList: ({ sources, previewModalState, isLoading, onSourceSelect, handleReload, error, }: SourceListProps) => JSX.Element;
+declare const SourceList: ({ sources, previewModalState, isLoading, onSourceSelect, handleReload, error, }: SourceListProps) => React.JSX.Element;
 export default SourceList;

package/lib/StatusIndicator/StatusIndicator.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { Status } from '../types';
 export type StatusIndicatorProps = {
     className?: string;
     status: Status;
 };
-declare const StatusIndicator: ({ className, status }: StatusIndicatorProps) => JSX.Element;
+declare const StatusIndicator: ({ className, status }: StatusIndicatorProps) => React.JSX.Element;
 export default StatusIndicator;

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HydratedResourceReference, Resource, ResourceReference, Source } from './types';
 import { ResourceBrowserContext, ResourceBrowserContextProps } from './ResourceBrowserContext/ResourceBrowserContext';
 export type { HydratedResourceReference, Resource, ResourceReference, Source, ResourceBrowserContextProps };
@@ -10,4 +11,4 @@ export type ResourceBrowserInputProps = {
     onChange(resource: HydratedResourceReference | null): void;
     onClear?(): void;
 };
-export declare const ResourceBrowserInput: ({ modalTitle, allowedTypes, onChange, value, isDisabled, onClear, }: ResourceBrowserInputProps) => JSX.Element;
+export declare const ResourceBrowserInput: ({ modalTitle, allowedTypes, onChange, value, isDisabled, onClear, }: ResourceBrowserInputProps) => React.JSX.Element;

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@squiz/resource-browser",
-  "version": "1.64.1",
+  "version": "1.66.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "compile": "npm run clean && npm run compile:styles && npm run compile:code",
     "compile:code": "tsc",
@@ -15,8 +19,8 @@
   },
   "dependencies": {
     "@mui/icons-material": "5.11.16",
-    "@squiz/dx-json-schema-lib": "1.64.0",
-    "@squiz/generic-browser-lib": "1.64.0",
+    "@squiz/dx-json-schema-lib": "^1.65.0",
+    "@squiz/generic-browser-lib": "^1.65.0",
     "pretty-bytes": "5.6.0",
     "react-aria": "3.23.1",
     "react-responsive": "9.0.2",
@@ -35,8 +39,8 @@
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "@types/postcss-js": "4.0.0",
-    "@types/react": "18.0.26",
-    "@types/react-dom": "18.0.9",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react-swc": "3.0.0",
     "autoprefixer": "10.4.14",
     "esbuild": "0.17.17",

package/src/Hooks/useResourcePath.spec.ts

@@ -19,7 +19,7 @@ describe('useResourcePath', () => {
     });
   });
 
-  it('setSource should update the source and clear the current hierarchy', async () => {
+  it('setSource should update the source and clear the current hierarchy', () => {
     const { result } = renderHook(() => useResourcePath());
     const source = mockScopedSource({
       source: { id: '1', name: 'Test source' },
@@ -27,15 +27,15 @@ describe('useResourcePath', () => {
     });
     const resource = mockResource({ id: '3', name: 'Test resource 2' });
 
-    await act(() => result.current.setSource(source));
-    await act(() => result.current.push(resource));
+    act(() => result.current.setSource(source));
+    act(() => result.current.push(resource));
 
     // make sure the current resource/hierarchy is populated
     expect(result.current.currentResource).toBe(resource);
     expect(result.current.hierarchy).toHaveLength(2);
 
     // set the source again
-    await act(() => result.current.setSource(source));
+    act(() => result.current.setSource(source));
 
     // make sure the current resource and hierarchy are reset
     expect(result.current.source).toBe(source);
@@ -43,15 +43,15 @@ describe('useResourcePath', () => {
     expect(result.current.hierarchy).toEqual([{ key: 'source:1-resource:2', label: 'Test resource', node: source }]);
   });
 
-  it('push should add the node to the hierarchy', async () => {
+  it('push should add the node to the hierarchy', () => {
     const { result } = renderHook(() => useResourcePath());
     const source = mockScopedSource({ source: { id: '1' } });
     const site = mockResource({ id: '1', type: { code: 'site', name: 'Site' }, name: 'My site' });
     const page = mockResource({ id: '2', type: { code: 'page', name: 'Page' }, name: 'My page' });
 
-    await act(() => result.current.setSource(source));
-    await act(() => result.current.push(site));
-    await act(() => result.current.push(page));
+    act(() => result.current.setSource(source));
+    act(() => result.current.push(site));
+    act(() => result.current.push(page));
 
     expect(result.current.source).toBe(source);
     expect(result.current.currentResource).toBe(page);
@@ -94,11 +94,7 @@ describe('useResourcePath', () => {
     ],
   ])(
     'popUntil should remove from the hierarchy until the node being popped to is hit - %s',
-    async (
-      description: string,
-      node: ScopedSource | Resource,
-      expectedHierarchy: Hierarchy<ScopedSource | Resource>,
-    ) => {
+    (description: string, node: ScopedSource | Resource, expectedHierarchy: Hierarchy<ScopedSource | Resource>) => {
       const { result } = renderHook(() => useResourcePath());
       const source = mockScopedSource({ source: { id: '1' } });
       const mockResources = [
@@ -107,16 +103,16 @@ describe('useResourcePath', () => {
         mockResource({ id: '3', name: 'Resource 3' }),
       ];
 
-      await act(() => result.current.setSource(source));
-      await act(() => result.current.push(mockResources[0]));
-      await act(() => result.current.push(mockResources[1]));
-      await act(() => result.current.push(mockResources[2]));
+      act(() => result.current.setSource(source));
+      act(() => result.current.push(mockResources[0]));
+      act(() => result.current.push(mockResources[1]));
+      act(() => result.current.push(mockResources[2]));
 
       // make sure hierarchy has expected length before popping
       expect(result.current.source).toBe(source);
       expect(result.current.hierarchy).toHaveLength(4);
 
-      await act(() => result.current.popUntil(node));
+      act(() => result.current.popUntil(node));
 
       expect(result.current.hierarchy).toEqual(expectedHierarchy);
     },

package/src/ResourceList/sample-resources.json

@@ -154,6 +154,19 @@
         },
         "name": "Word document",
         "childCount": 0
+      },
+      {
+        "id": "111",
+        "type": {
+          "code": "page_content",
+          "name": "Content Page"
+        },
+        "status": {
+          "code": "live",
+          "name": "Live"
+        },
+        "name": "Content page",
+        "childCount": 0
       }
     ]
   },