Merge pull request #464 from StampyAI/see-more

fix see more
StampyAI · Mar 4, 2024 · 3c1cf73 · 3c1cf73
2 parents feb4466 + e5518b7
commit 3c1cf73
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/app/components/Article/Contents.tsx b/app/components/Article/Contents.tsx
@@ -146,6 +146,17 @@ const Contents = ({pageid, html, glossary}: {pageid: PageId; html: string; gloss
 
     updateTextNodes(el, insertGlossary(pageid, glossary))
 
+    const toggleClass = (e: Event) => {
+      e.preventDefault()
+      const target = e.target as HTMLElement
+      target.classList.toggle('visible')
+    }
+    Array.from(document.getElementsByClassName('see-more')).forEach((e) => {
+      const elem = e.cloneNode(true)
+      elem.addEventListener('click', toggleClass)
+      e.replaceWith(elem)
+    })
+
     // In theory this could be extended to all links
     el.querySelectorAll('.footnote-ref > a').forEach((e) => {
       const footnote = footnoteHTML(el, e as HTMLAnchorElement)

diff --git a/app/server-utils/parsing-utils.ts b/app/server-utils/parsing-utils.ts
@@ -56,7 +56,7 @@ export const convertToHtmlAndWrapInDetails = (markdown: string): string => {
   // On the other hand, if the whole text isn't rendered as one, footnotes will break.
   // To get round this, replace the [See more...] button with a magic string, render the
   // markdown, then mangle the resulting HTML to add an appropriate button link
-  markdown = markdown.replaceAll(/\s*\[[Ss]ee more\W*?\]\s*/g, seeMoreToken)
+  markdown = markdown.replaceAll(/\[[Ss]ee more\W*?\]/g, seeMoreToken)
   markdown = md.render(markdown)
   markdown = wrap(markdown.split(seeMoreToken))
 

diff --git a/app/server-utils/stampy.ts b/app/server-utils/stampy.ts
@@ -132,7 +132,7 @@ export type AnswersRow = CodaRowCommon & {
     Banners: '' | Entity[]
     'Rich Text': string
     Subtitle?: string
-    Icon?: string
+    Icon?: Entity | string | Entity[]
     Parents?: Entity[]
     Order?: number
   }
@@ -250,7 +250,7 @@ const renderText = (pageid: PageId, markdown: string | null): string | null => {
   if (!markdown) return null
 
   markdown = extractText(markdown)
-  markdown = urlToIframe(markdown)
+  markdown = urlToIframe(markdown || '')
 
   let html = convertToHtmlAndWrapInDetails(markdown)
   html = uniqueFootnotes(html, pageid)
@@ -260,8 +260,17 @@ const renderText = (pageid: PageId, markdown: string | null): string | null => {
   return html
 }
 
+// Icons can be returned as strings or objects
+const extractIcon = (val?: string | string[] | Entity | Entity[]): string | undefined => {
+  if (!val) return val
+  const item = head(val)
+  if (typeof item === 'string') return extractText(val as string)
+  if (item) return (item as Entity).url
+  return undefined
+}
+
 // Sometimes string fields are returned as lists. This can happen when there are duplicate entries in Coda
-const head = (item: string | string[]) => {
+const head = (item: any | any[]) => {
   if (Array.isArray(item)) return item[0]
   return item
 }
@@ -291,7 +300,7 @@ const convertToQuestion = ({name, values, updatedAt} = {} as AnswersRow): Questi
   status: values['Status']?.name as QuestionStatus,
   alternatePhrasings: extractText(values['Alternate Phrasings']),
   subtitle: extractText(values.Subtitle),
-  icon: extractText(values.Icon),
+  icon: extractIcon(values.Icon),
   parents: !values.Parents ? [] : values.Parents?.map(({name}) => name),
   updatedAt: updatedAt || values['Doc Last Edited'],
   order: values.Order || 0,