@grantbii/design-system 1.0.51 → 1.0.53

package/core/organisms/GrantMatch.d.ts

@@ -1,21 +1,15 @@
-type MatchQuery = {
-    files: File[];
-    text: string;
-};
-type GrantMatchProps = {
-    query: MatchQuery;
+import { GrantMatchQuery } from "@grantbii/ui-base/match/models";
+type GrantMatchQueryProps = {
+    query: GrantMatchQuery;
     updateQueryFiles: (newFiles: File[]) => void;
+    removeQueryFile: (fileName: string) => void;
     updateQueryText: (newText: string) => void;
-    onPerformGrantMatch: (query: MatchQuery) => void;
-    onResetGrantMatch: () => void;
+    removeQueryText: () => void;
+    resetQuery: () => void;
 };
-declare const GrantMatch: ({ query, updateQueryFiles, updateQueryText, onPerformGrantMatch, onResetGrantMatch, }: GrantMatchProps) => import("react/jsx-runtime").JSX.Element;
-export default GrantMatch;
-export declare const useMatchQuery: () => {
-    query: {
-        files: File[];
-        text: string;
-    };
-    updateQueryFiles: (newFiles: File[]) => void;
-    updateQueryText: (newText: string) => void;
+type GrantMatchProps = GrantMatchQueryProps & {
+    isModalFullScreen?: boolean;
 };
+declare const GrantMatch: ({ query, updateQueryFiles, removeQueryFile, updateQueryText, removeQueryText, resetQuery, isModalFullScreen, }: GrantMatchProps) => import("react/jsx-runtime").JSX.Element;
+export default GrantMatch;
+export declare const useGrantMatchQueryItems: () => GrantMatchQueryProps;

package/core/organisms/GrantMatch.js

@@ -1,65 +1,41 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { isGrantMatchActive } from "@grantbii/ui-base/match/mappings";
 import { useState } from "react";
 import styled from "styled-components";
 import { Badge, Button, Textarea } from "../atoms";
 import { Colors, Icons } from "../foundations";
 import { FileDrop, Modal, useFileDrop, useModal } from "../molecules";
-const GrantMatch = ({ query, updateQueryFiles, updateQueryText, onPerformGrantMatch, onResetGrantMatch, }) => {
+const GrantMatch = ({ query, updateQueryFiles, removeQueryFile, updateQueryText, removeQueryText, resetQuery, isModalFullScreen, }) => {
     const { showModal, openModal, closeModal } = useModal();
-    const { performGrantMatch, resetGrantMatch, removeUploadedFile, removeQueryText, } = useGrantMatch(query, updateQueryFiles, updateQueryText, onPerformGrantMatch, onResetGrantMatch, closeModal);
-    return (_jsxs(Container, { children: [_jsx(GrantMatchButtons, { active: isQueryActive(query), onClickMatch: () => openModal(), onClickReset: () => resetGrantMatch() }), isQueryActive(query) ? (_jsx(QueryItems, { uploadedFiles: query.files, removeUploadedFile: removeUploadedFile, queryText: query.text, removeQueryText: removeQueryText })) : (_jsx(_Fragment, {})), showModal ? (_jsx(GrantMatchModal, { activeFiles: query.files, activeText: query.text, performGrantMatch: performGrantMatch, onClickCancel: () => closeModal() })) : (_jsx(_Fragment, {}))] }));
-};
-export default GrantMatch;
-export const useMatchQuery = () => {
-    const [files, setFiles] = useState([]);
-    const [text, setText] = useState("");
-    return {
-        query: { files, text },
-        updateQueryFiles: (newFiles) => setFiles(newFiles),
-        updateQueryText: (newText) => setText(newText),
-    };
-};
-const useGrantMatch = (matchQuery, updateQueryFiles, updateQueryText, onPerformGrantMatch, onResetGrantMatch, closeModal) => {
+    const isActive = isGrantMatchActive(query);
     const performGrantMatch = (newFiles, newText) => {
         updateQueryFiles(newFiles);
         updateQueryText(newText);
-        onPerformGrantMatch({ files: newFiles, text: newText });
         closeModal();
     };
-    const resetGrantMatch = () => {
-        updateQueryFiles([]);
-        updateQueryText("");
-        onResetGrantMatch();
-    };
-    const removeUploadedFile = (fileName) => {
-        const newFiles = matchQuery.files.filter((file) => file.name !== fileName);
-        updateQueryFiles(newFiles);
-        const newQuery = { files: newFiles, text: matchQuery.text };
-        if (isQueryActive(newQuery)) {
-            onPerformGrantMatch(newQuery);
-        }
-        else {
-            onResetGrantMatch();
-        }
-    };
-    const removeQueryText = () => {
-        updateQueryText("");
-        const newQuery = { files: matchQuery.files, text: "" };
-        if (isQueryActive(newQuery)) {
-            onPerformGrantMatch(newQuery);
-        }
-        else {
-            onResetGrantMatch();
-        }
-    };
+    return (_jsxs(Container, { children: [_jsx(GrantMatchButtons, { isActive: isActive, onClickMatch: () => openModal(), onClickReset: () => resetQuery() }), isActive ? (_jsx(QueryItems, { queryFiles: query.files, removeQueryFile: removeQueryFile, queryText: query.text, removeQueryText: removeQueryText })) : (_jsx(_Fragment, {})), showModal ? (_jsx(GrantMatchModal, { activeFiles: query.files, activeText: query.text, performGrantMatch: performGrantMatch, onClickCancel: () => closeModal(), isFullScreen: isModalFullScreen })) : (_jsx(_Fragment, {}))] }));
+};
+export default GrantMatch;
+const BLANK_GRANT_MATCH_QUERY = { files: [], text: "" };
+export const useGrantMatchQueryItems = () => {
+    const [query, setQuery] = useState(() => (Object.assign({}, BLANK_GRANT_MATCH_QUERY)));
+    const updateQueryFiles = (files) => setQuery(({ text }) => ({ files, text }));
+    const removeQueryFile = (fileName) => setQuery(({ files, text }) => ({
+        files: files.filter((file) => file.name !== fileName),
+        text,
+    }));
+    const updateQueryText = (text) => setQuery(({ files }) => ({ files, text }));
+    const removeQueryText = () => setQuery(({ files }) => ({ files, text: "" }));
+    const resetQuery = () => setQuery(Object.assign({}, BLANK_GRANT_MATCH_QUERY));
     return {
-        performGrantMatch,
-        resetGrantMatch,
-        removeUploadedFile,
+        query,
+        updateQueryFiles,
+        removeQueryFile,
+        updateQueryText,
         removeQueryText,
+        resetQuery,
     };
 };
-const isQueryActive = (query) => query.files.length !== 0 || query.text.trim() !== "";
 const Container = styled.div `
   display: flex;
   flex-direction: column;
@@ -70,13 +46,13 @@ const Container = styled.div `
   width: 100%;
   max-width: 100vw;
 `;
-const GrantMatchButtons = ({ active, onClickMatch, onClickReset, }) => (_jsxs(Buttons, { children: [_jsx(GrantMatchButton, { active: active, onClick: onClickMatch }), active ? (_jsx(Button, { text: "Reset", onClick: onClickReset, color: Colors.typography.blackMedium, underline: true })) : (_jsx(_Fragment, {}))] }));
+const GrantMatchButtons = ({ isActive, onClickMatch, onClickReset, }) => (_jsxs(Buttons, { children: [_jsx(GrantMatchButton, { isActive: isActive, onClick: onClickMatch }), isActive ? (_jsx(Button, { text: "Reset", onClick: onClickReset, color: Colors.typography.blackMedium, underline: true })) : (_jsx(_Fragment, {}))] }));
 const Buttons = styled.div `
   display: flex;
   align-items: center;
   gap: 8px;
 `;
-const GrantMatchButton = ({ active, onClick }) => (_jsxs(BaseGrantMatchButton, { type: "button", "$active": active, onClick: onClick, children: [_jsx(Icons.GrantMatchIcon, { size: 20 }), _jsx("p", { children: "Find grants that match your needs" }), _jsx(Icons.MagnifyingGlassIcon, { size: 20 })] }));
+const GrantMatchButton = ({ isActive, onClick }) => (_jsxs(BaseGrantMatchButton, { type: "button", "$isActive": isActive, onClick: onClick, children: [_jsx(Icons.GrantMatchIcon, { size: 20 }), _jsx("p", { children: "Find grants that match your needs" }), _jsx(Icons.MagnifyingGlassIcon, { size: 20 })] }));
 const BaseGrantMatchButton = styled.button `
   display: flex;
   align-items: center;
@@ -92,12 +68,12 @@ const BaseGrantMatchButton = styled.button `
   color: ${Colors.typography.blackMedium};
   background-color: ${Colors.base.white};
   border: 1px solid
-    ${({ $active }) => ($active ? Colors.accent.yellow1 : Colors.neutral.grey3)};
+    ${({ $isActive }) => $isActive ? Colors.accent.yellow1 : Colors.neutral.grey3};
 `;
-const QueryItems = ({ uploadedFiles, removeUploadedFile, queryText, removeQueryText, }) => (_jsxs(BaseQueryItems, { children: [uploadedFiles.map((file) => {
+const QueryItems = ({ queryFiles, removeQueryFile, queryText, removeQueryText, }) => (_jsxs(BaseQueryItems, { children: [queryFiles.map((file) => {
             var _a;
-            return (_jsx(Badge, { text: file.name, Icon: (_a = FILE_TYPE_ICON_MAP[file.type]) !== null && _a !== void 0 ? _a : Icons.FileIcon, onClickClose: () => removeUploadedFile(file.name), textWidthPixels: 160 }, file.name));
-        }), queryText === "" ? (_jsx(_Fragment, {})) : (_jsx(Badge, { text: "Additional Information", Icon: Icons.TextAaIcon, onClickClose: () => removeQueryText(), textWidthPixels: 160 }, "additional-information-query-item"))] }));
+            return (_jsx(Badge, { text: file.name, Icon: (_a = FILE_TYPE_ICON_MAP[file.type]) !== null && _a !== void 0 ? _a : Icons.FileIcon, onClickClose: () => removeQueryFile(file.name), textWidthPixels: 160 }, file.name));
+        }), queryText === "" ? (_jsx(_Fragment, {})) : (_jsx(Badge, { text: "Additional Information", Icon: Icons.TextAaIcon, onClickClose: () => removeQueryText(), textWidthPixels: 180 }, "additional-information-query-item"))] }));
 const BaseQueryItems = styled.div `
   display: flex;
   align-items: center;
@@ -115,11 +91,11 @@ const BaseQueryItems = styled.div `
 const FILE_TYPE_ICON_MAP = {
     "application/pdf": Icons.FilePdfIcon,
 };
-const GrantMatchModal = ({ activeFiles, activeText, performGrantMatch, onClickCancel, }) => {
+const GrantMatchModal = ({ activeFiles, activeText, performGrantMatch, onClickCancel, isFullScreen, }) => {
     const { files, uploadFiles, removeFile } = useFileDrop(activeFiles);
     const [queryText, setQueryText] = useState(activeText);
     const updateQueryText = (newText) => setQueryText(newText);
-    return (_jsx(Modal, { header: _jsx(Header, {}), content: _jsx(Content, { files: files, uploadFiles: uploadFiles, removeFile: removeFile, queryText: queryText, updateQueryText: updateQueryText }), footer: _jsx(Button, { text: "Find My Grants", onClick: () => performGrantMatch(files, queryText), backgroundColor: Colors.accent.yellow1 }), onClickCancel: onClickCancel }));
+    return (_jsx(Modal, { header: _jsx(Header, {}), content: _jsx(Content, { files: files, uploadFiles: uploadFiles, removeFile: removeFile, queryText: queryText, updateQueryText: updateQueryText }), footer: _jsx(Button, { text: "Find My Grants", onClick: () => performGrantMatch(files, queryText), backgroundColor: Colors.accent.yellow1 }), onClickCancel: onClickCancel, isFullScreen: isFullScreen }));
 };
 const Header = () => (_jsxs(BaseHeader, { children: [_jsx(Icons.GrantMatchIcon, { size: 24 }), _jsx("div", { children: "Grant Match" })] }));
 const BaseHeader = styled.div `

package/core/organisms/YesNoOptions.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { LogicOption } from "@grantbii/ui-base/grant/enums";
 import styled from "styled-components";
 import { RadioButton } from "../atoms";
-import { LogicOption } from "@grantbii/ui-base/enums";
 const YesNoOptions = ({ name, yesProps, noProps, unsureProps, }) => (_jsxs(RadioGroup, { children: [_jsx(RadioButton, Object.assign({}, yesProps, { id: `${name}-yes`, label: LogicOption.YES, value: LogicOption.YES, name: name })), _jsx(RadioButton, Object.assign({}, noProps, { id: `${name}-no`, label: LogicOption.NO, value: LogicOption.NO, name: name })), unsureProps ? (_jsx(RadioButton, Object.assign({}, unsureProps, { id: `${name}-unsure`, label: LogicOption.UNSURE, value: LogicOption.UNSURE, name: name }))) : (_jsx(_Fragment, {}))] }));
 export default YesNoOptions;
 const RadioGroup = styled.div `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grantbii/design-system",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "description": "Grantbii's Design System",
   "homepage": "https://design.grantbii.com",
   "repository": {
@@ -18,7 +18,7 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
-    "@grantbii/ui-base": "1.0.13",
+    "@grantbii/ui-base": "1.0.14",
     "@phosphor-icons/react": "^2.1.10",
     "country-flag-icons": "^1.5.19",
     "next": "^15.3.5",

package/stories/molecules/RadioButtons.stories.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { RadioButtons } from "@/.";
-import { Location } from "@grantbii/ui-base/enums";
+import { Location } from "@grantbii/ui-base/grant/enums";
 import { useState } from "react";
 const RadioButtonsExample = ({ controlled }) => {
     const [location, setLocation] = useState("");

package/stories/organisms/GrantMatch.stories.d.ts

@@ -1,6 +1,10 @@
 import { Meta, StoryObj } from "@storybook/nextjs-vite";
-declare const GrantMatchExample: () => import("react/jsx-runtime").JSX.Element;
+type GrantMatchExampleProps = {
+    isModalFullScreen?: boolean;
+};
+declare const GrantMatchExample: ({ isModalFullScreen }: GrantMatchExampleProps) => import("react/jsx-runtime").JSX.Element;
 declare const meta: Meta<typeof GrantMatchExample>;
 export default meta;
 type Story = StoryObj<typeof meta>;
-export declare const Example: Story;
+export declare const PopUp: Story;
+export declare const FullScreen: Story;

package/stories/organisms/GrantMatch.stories.js

@@ -1,10 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { GrantMatch } from "@/.";
-import { useMatchQuery } from "@/core/organisms/GrantMatch";
-const GrantMatchExample = () => {
-    const matchQuery = useMatchQuery();
-    return (_jsx(GrantMatch, Object.assign({}, matchQuery, { onPerformGrantMatch: () => console.log("finding grants..."), onResetGrantMatch: () => console.log("resetting grant match...") })));
+import { useGrantMatchQueryItems } from "@/core/organisms/GrantMatch";
+import styled from "styled-components";
+const GrantMatchExample = ({ isModalFullScreen }) => {
+    const grantMatchProps = useGrantMatchQueryItems();
+    return (_jsx(Container, { children: _jsx(GrantMatch, Object.assign({}, grantMatchProps, { isModalFullScreen: isModalFullScreen })) }));
 };
+const Container = styled.div `
+  width: 90vw;
+`;
 const meta = {
     title: "Organisms/Grant Match",
     component: GrantMatchExample,
@@ -14,6 +18,9 @@ const meta = {
     },
 };
 export default meta;
-export const Example = {
+export const PopUp = {
     args: {},
 };
+export const FullScreen = {
+    args: { isModalFullScreen: true },
+};