Better handling of trix-toolbar

powerhome · Jul 24, 2024 · bfde02e · bfde02e
1 parent c570ad9
commit bfde02e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/playbook/app/pb_kits/playbook/pb_rich_text_editor/_rich_text_editor.tsx b/playbook/app/pb_kits/playbook/pb_rich_text_editor/_rich_text_editor.tsx
@@ -1,16 +1,22 @@
 import React, { useEffect, useState } from 'react'
 import classnames from 'classnames'
-import Trix from "trix"
 import { TrixEditor } from "react-trix"
 
 import inlineFocus from './inlineFocus'
 import useFocus from './useFocus'
 import { globalProps, GlobalProps } from '../utilities/globalProps'
 import { buildAriaProps, buildDataProps, noop, buildHtmlProps } from '../utilities/props'
 
-Trix.config.textAttributes.inlineCode = {
-  tagName: 'code',
-  inheritable: true,
+try {
+  import('trix').then((Trix) => {
+    Trix.config.textAttributes.inlineCode = {
+      tagName: 'code',
+      inheritable: true,
+    }
+  })
+  import('@haxtheweb/deduping-fix')
+} catch (e) {
+  // do nothing
 }
 
 import EditorToolbar from './TipTap/Toolbar'

diff --git a/playbook/app/pb_kits/playbook/pb_rich_text_editor/types.d.ts b/playbook/app/pb_kits/playbook/pb_rich_text_editor/types.d.ts
@@ -0,0 +1 @@
+declare module '@haxtheweb/deduping-fix';
diff --git a/playbook/package.json b/playbook/package.json
@@ -64,6 +64,7 @@
     "@babel/preset-react": "^7.12.5",
     "@babel/preset-typescript": "^7.15.0",
     "@codesandbox/sandpack-react": "^2.12.1",
+    "@haxtheweb/deduping-fix": "^9.0.1",
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/pluginutils": "^5.1.0",
     "@testing-library/jest-dom": "5.16.4",

diff --git a/yarn.lock b/yarn.lock
@@ -2616,6 +2616,11 @@
   resolved "https://npm.powerapp.cloud/@gilbarbara/deep-equal/-/deep-equal-0.1.2.tgz#1a106721368dba5e7e9fb7e9a3a6f9efbd8df36d"
   integrity sha512-jk+qzItoEb0D0xSSmrKDDzf9sheQj/BAPxlgNxgmOaA3mxpUa6ndJLYGZKsJnIVEQSD8zcTbyILz7I0HcnBCRA==
 
+"@haxtheweb/deduping-fix@^9.0.1":
+  version "9.0.1"
+  resolved "https://npm.powerapp.cloud/@haxtheweb/deduping-fix/-/deduping-fix-9.0.1.tgz#1e03e2ba0dd066bc414ee38002c58b8c8f6d5532"
+  integrity sha512-X0z4rTTrKQ+DoDPe5VfWkzIVrb0DQTOEaXaOxQ5WNRi90PkF8yXwl09jm81qUQHNcyVChc1MXZkc9qPuYgAm1g==
+
 "@hotwired/turbo-rails@^7.3.0":
   version "7.3.0"
   resolved "https://npm.powerapp.cloud/@hotwired/turbo-rails/-/turbo-rails-7.3.0.tgz#422c21752509f3edcd6c7b2725bbe9e157815f51"