@availity/mui-spaces 0.2.5 → 0.3.0

package/jest.config.js

@@ -1,6 +1,7 @@
 const global = require('../../jest.config.global');
 
 const esModules = [
+  '@availity/hooks',
   'bail',
   'character-entities',
   'comma-separated-tokens',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@availity/mui-spaces",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Availity MUI Spaces Component - part of the @availity/element design system",
   "keywords": [
     "react",
@@ -32,37 +32,43 @@
     "publish:canary": "yarn npm publish --access public --tag canary"
   },
   "devDependencies": {
-    "@availity/mock": "^0.0.0",
     "@availity/mui-button": "^0.6.7",
+    "@availity/mui-dialog": "^0.1.8",
     "@availity/mui-disclaimer": "^0.1.1",
+    "@availity/mui-icon": "^0.8.2",
+    "@availity/mui-layout": "^0.1.6",
     "@availity/mui-modal": "^0.1.4",
     "@availity/mui-typography": "^0.2.0",
     "@mui/material": "^5.15.15",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-image": "^4.1.0",
-    "react-markdown": "^9.0.1",
     "tsup": "^8.0.2",
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "@availity/mui-button": "^0.6.7",
+    "@availity/mui-dialog": "^0.1.8",
     "@availity/mui-disclaimer": "^0.1.1",
+    "@availity/mui-icon": "^0.8.2",
+    "@availity/mui-layout": "^0.1.6",
     "@availity/mui-modal": "^0.1.4",
     "@availity/mui-typography": "^0.2.0",
     "@mui/material": "^5.11.9",
-    "react": ">=16.3.0",
-    "react-image": "^4.1.0",
-    "react-markdown": "^9.0.1"
+    "react": ">=16.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@availity/api-axios": "^8.0.8",
+    "@availity/hooks": "^5.0.2",
     "@availity/message-core": "^6.1.3",
+    "@availity/native-form": "^5.0.6",
+    "@availity/resolve-url": "^2.0.6",
     "@tanstack/react-query": "^4.36.1",
     "dayjs": "^1.11.10",
-    "qs": "^6.12.1"
+    "qs": "^6.12.1",
+    "react-image": "^4.1.0",
+    "react-markdown": "^9.0.1"
   }
 }

package/src/index.ts

@@ -1 +1,8 @@
 export * from './lib/Spaces';
+export * from './lib/SpacesLink/SpacesLink';
+export * from './lib/SpacesAgreement';
+export * from './lib/SpacesDisclaimer';
+export * from './lib/SpacesGhostText';
+export * from './lib/SpacesImage';
+
+export type { Space } from './lib/spaces-types';

package/src/lib/Spaces.test.tsx

@@ -3,6 +3,7 @@ import { useState } from 'react';
 import { render, waitFor, fireEvent } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { Spaces, useSpaces, useSpacesContext } from '..';
+import type { Space } from './spaces-types';
 
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import { server } from '../../../mock/src/lib/server';
@@ -179,10 +180,10 @@ describe('useSpaces', () => {
     );
 
     // Check that all spaces get returned when no configurationIds get passed to useSpaces hook
-    await waitFor(() => getByText('Id: 1 Id: 2 Id: 3'));
+    await waitFor(() => getByText('Id: 11 Id: 22 Id: 33'));
 
     // Check that spaces for configurationIds get returned when configurationIds passed to useSpaces hook
-    await waitFor(() => getByText('Id: 2 Id: 3'));
+    await waitFor(() => getByText('Id: 22 Id: 33'));
   });
 
   it('returns all matching spaces when searching by payerId', async () => {
@@ -197,8 +198,8 @@ describe('useSpaces', () => {
     );
 
     // Check that spaces for payer ids get returned when ids passed to useSpaces hook
-    await waitFor(() => getByText('Id: 1 Id: 2'));
-    await waitFor(() => getByText('Id: 1 Id: 2 Id: 3'));
+    await waitFor(() => getByText('Id: 11 Id: 22'));
+    await waitFor(() => getByText('Id: 11 Id: 22 Id: 33'));
   });
 
   it('renders with warning when returning all spaces because no ids were passed in', async () => {

package/src/lib/Spaces.tsx

@@ -1,8 +1,11 @@
 import { createContext, useContext, useReducer, useEffect } from 'react';
 import { useQueries } from '@tanstack/react-query';
 import { spacesReducer, fetchAllSpaces } from './spaces-data';
-import { Space, SpacesProps, SpacesContextType } from './spaces-types';
 import configurationFindMany from './configurationFindMany';
+import { ModalProvider } from './modals/ModalProvider';
+import type { Space, SpacesProps, SpacesContextType, UseSpaces } from './spaces-types';
+import type { SsoTypeSpace } from './SpacesLink/spaces-link-types';
+import { isReactNodeFunction } from './helpers';
 
 export const INITIAL_STATE = {
   loading: true,
@@ -168,10 +171,16 @@ export const Spaces = ({
     });
   }, [spacesBySpaceIds, spacesByPayerIds, payerIds, spaceIds]);
 
-  // const hasParentModalProvider = useModal() !== undefined;
+  const spacesChildren = () => {
+    if (children) {
+      return isReactNodeFunction(children)
+        ? (() => children({ spaces: [spacesMap.values()], loading, error }))()
+        : children;
+    }
+  };
+
   return (
     <SpacesContext.Provider
-      children={children}
       value={{
         spaces: spacesMap,
         spacesByConfig: configIdsMap,
@@ -179,11 +188,13 @@ export const Spaces = ({
         loading: loading || isLoadingByPayerIds || isLoadingBySpaceIds,
         error,
       }}
-    />
+    >
+      <ModalProvider>{spacesChildren()}</ModalProvider>
+    </SpacesContext.Provider>
   );
 };
 
-export const useSpaces = (...ids: string[]) => {
+export const useSpaces: UseSpaces = (...ids) => {
   const { spaces, spacesByConfig, spacesByPayer } = useSpacesContext();
 
   const idsIsEmpty = !ids || ids.length === 0;
@@ -195,7 +206,7 @@ export const useSpaces = (...ids: string[]) => {
     return spaces && [...spaces.values()];
   }
 
-  return ids.reduce((acc: Space[], id) => {
+  return ids.reduce((acc: (Space | SsoTypeSpace)[], id) => {
     const matchedSpace = spaces?.get(id) || spacesByConfig?.get(id);
 
     if (matchedSpace) {

package/src/lib/SpacesGhostText.tsx

@@ -10,7 +10,7 @@ export const SpacesGhostText = ({ spaceId, id, ...props }: SpacesGhostTextProps)
 
   const space = spaces?.[0];
 
-  if (space?.isGhost) {
+  if (space?.isGhosted) {
     return (
       <small id={id || `app-ghost-text-${spaceId}`} {...props}>
         <em>{space?.meta?.ghostText}</em>

package/src/lib/SpacesImage.test.tsx

@@ -40,6 +40,6 @@ describe('SpacesImage', () => {
     await waitForElementToBeRemoved(getByRole('progressbar'));
 
     // Ensure the correct src was selected.
-    expect(mockImage.mock.calls[0][0].src).toEqual('/element/spaces/tile.jpg');
+    expect(mockImage.mock.calls[0][0].src).toEqual('/spaces/tile.jpg');
   });
 });