From 33c08119ec66035260d9ec6ddfcdf7097e1ab3aa Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Mon, 20 Sep 2021 17:53:00 +1000 Subject: [PATCH] format --- app/web/src/components/CadPackage/CadPackage.tsx | 9 ++++++--- app/web/src/components/EditorGuide/EditorGuide.tsx | 2 +- app/web/src/helpers/hooks/useMarkdownMetaData.ts | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/web/src/components/CadPackage/CadPackage.tsx b/app/web/src/components/CadPackage/CadPackage.tsx index 73dce8d..76ddb3c 100644 --- a/app/web/src/components/CadPackage/CadPackage.tsx +++ b/app/web/src/components/CadPackage/CadPackage.tsx @@ -64,9 +64,12 @@ const CadPackage = ({ // Returns a proper button if an onClick handler is passed in, or a div // if the element is meant to be a simple badge function ButtonOrDiv({ onClick, className, children }) { - return (onClick - ? - :
{ children }
+ return onClick ? ( + + ) : ( +
{children}
) } diff --git a/app/web/src/components/EditorGuide/EditorGuide.tsx b/app/web/src/components/EditorGuide/EditorGuide.tsx index bc4f374..2b43395 100644 --- a/app/web/src/components/EditorGuide/EditorGuide.tsx +++ b/app/web/src/components/EditorGuide/EditorGuide.tsx @@ -1,4 +1,4 @@ -import { useMarkdownMetaData } from 'src/helpers/markdown' +import { useMarkdownMetaData } from 'src/helpers/hooks/useMarkdownMetaData' import Editor from 'rich-markdown-editor' import { useRef } from 'react' import KeyValue from 'src/components/KeyValue/KeyValue' diff --git a/app/web/src/helpers/hooks/useMarkdownMetaData.ts b/app/web/src/helpers/hooks/useMarkdownMetaData.ts index 5b67ff6..cb9ea3e 100644 --- a/app/web/src/helpers/hooks/useMarkdownMetaData.ts +++ b/app/web/src/helpers/hooks/useMarkdownMetaData.ts @@ -3,16 +3,18 @@ export function useMarkdownMetaData(text: string): Array { const metaData = {} as any return React.useMemo(() => { - const metaRegExp = RegExp(/^---[\r\n](((?!---).|[\r\n])*)[\r\n]---$/m) as any + const metaRegExp = RegExp( + /^---[\r\n](((?!---).|[\r\n])*)[\r\n]---$/m + ) as any // get metadata const rawMetaData = metaRegExp.exec(text) - + let keyValues - + if (rawMetaData !== null) { // rawMeta[1] are the stuff between "---" keyValues = rawMetaData[1].split('\n') - + // which returns a list of key values: ["key1: value", "key2: value"] keyValues.forEach((keyValue) => { // split each keyValue to keys and values