@grantbii/design-system 1.0.55 → 1.0.56

package/core/organisms/GrantMatch.d.ts

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

package/core/organisms/GrantMatch.js

@@ -5,12 +5,11 @@ 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, removeQueryFile, updateQueryText, removeQueryText, resetQuery, isModalFullScreen, }) => {
+const GrantMatch = ({ query, onPerformGrantMatch, removeQueryFile, removeQueryText, resetQuery, isModalFullScreen, }) => {
     const { showModal, openModal, closeModal } = useModal();
     const isActive = isGrantMatchActive(query);
-    const performGrantMatch = (newFiles, newText) => {
-        updateQueryFiles(newFiles);
-        updateQueryText(newText);
+    const performGrantMatch = (newQuery) => {
+        onPerformGrantMatch(newQuery);
         closeModal();
     };
     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, {}))] }));
@@ -19,19 +18,17 @@ 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 updateQuery = (newQuery) => setQuery(Object.assign({}, newQuery));
     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 {
         query,
-        updateQueryFiles,
+        updateQuery,
         removeQueryFile,
-        updateQueryText,
         removeQueryText,
         resetQuery,
     };
@@ -93,9 +90,8 @@ const FILE_TYPE_ICON_MAP = {
 };
 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, isFullScreen: isFullScreen }));
+    const [text, setText] = useState(activeText);
+    return (_jsx(Modal, { header: _jsx(Header, {}), content: _jsx(Content, { files: files, uploadFiles: uploadFiles, removeFile: removeFile, queryText: text, updateQueryText: (newText) => setText(newText) }), footer: _jsx(Button, { text: "Find My Grants", onClick: () => performGrantMatch({ files, text }), 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 `
@@ -103,10 +99,8 @@ const BaseHeader = styled.div `
   align-items: center;
   gap: 12px;
 `;
-const Content = ({ files, uploadFiles, removeFile, queryText, updateQueryText, }) => {
-    const additionalInformationId = "grant-match-additional-information";
-    return (_jsxs(BaseContent, { children: [_jsx(FileDrop, { uploadedFiles: files, uploadFiles: uploadFiles, removeFile: removeFile }), _jsxs(QueryText, { children: [_jsx("label", { htmlFor: additionalInformationId, children: "Additional Information" }), _jsx(Textarea, { id: additionalInformationId, value: queryText, onChange: (event) => updateQueryText(event.target.value) })] })] }));
-};
+const Content = ({ files, uploadFiles, removeFile, queryText, updateQueryText, }) => (_jsxs(BaseContent, { children: [_jsx(FileDrop, { uploadedFiles: files, uploadFiles: uploadFiles, removeFile: removeFile }), _jsxs(QueryText, { children: [_jsx("label", { htmlFor: ADDITIONAL_INFORMATION_ID, children: "Additional Information" }), _jsx(Textarea, { id: ADDITIONAL_INFORMATION_ID, value: queryText, onChange: (event) => updateQueryText(event.target.value) })] })] }));
+const ADDITIONAL_INFORMATION_ID = "grant-match-additional-information";
 const BaseContent = styled.div `
   display: flex;
   flex-direction: column;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grantbii/design-system",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Grantbii's Design System",
   "homepage": "https://design.grantbii.com",
   "repository": {

package/stories/organisms/GrantMatch.stories.js

@@ -3,8 +3,12 @@ import { GrantMatch } from "@/.";
 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 { query, updateQuery, removeQueryFile, removeQueryText, resetQuery } = useGrantMatchQueryItems();
+    const onPerformGrantMatch = (newQuery) => {
+        updateQuery(newQuery);
+        console.log("finding grants...");
+    };
+    return (_jsx(Container, { children: _jsx(GrantMatch, { query: query, onPerformGrantMatch: onPerformGrantMatch, removeQueryFile: removeQueryFile, removeQueryText: removeQueryText, resetQuery: resetQuery, isModalFullScreen: isModalFullScreen }) }));
 };
 const Container = styled.div `
   width: 90vw;