Merge pull request #318 from Renumics/refactor/support-typed-lenses

refactor: allow lenses with typed values in lens registry
Renumics · Oct 27, 2023 · 1e67680 · 1e67680
2 parents d483207 + fcc7c83
commit 1e67680
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/lenses/SafeHtmlLens.tsx b/src/lenses/SafeHtmlLens.tsx
@@ -3,8 +3,8 @@ import { Lens } from '../types';
 import DOMPurify from 'dompurify';
 import Html from '../components/ui/Html';
 
-const SafeHtmlLens: Lens = ({ value }) => {
-    const safe_html = DOMPurify.sanitize(value as string);
+const SafeHtmlLens: Lens<string> = ({ value }) => {
+    const safe_html = DOMPurify.sanitize(value);
 
     return <Html html={safe_html} />;
 };

diff --git a/src/lenses/TextLens.tsx b/src/lenses/TextLens.tsx
@@ -1,12 +1,10 @@
 import 'twin.macro';
 import { Lens } from '../types';
 
-const TextLens: Lens = ({ value }) => {
-    const text = value as string;
-
+const TextLens: Lens<string> = ({ value }) => {
     return (
         <div tw="w-full h-full overflow-y-auto p-1 text-xs whitespace-pre-wrap">
-            {text}
+            {value}
         </div>
     );
 };

diff --git a/src/stores/components.ts b/src/stores/components.ts
@@ -6,8 +6,8 @@ import { DataType } from '../datatypes';
 import { ALL_LENSES } from '../lenses';
 import { ALL_WIDGETS } from '../widgets';
 
-export function isLensCompatible(
-    view: Lens,
+export function isLensCompatible<T>(
+    view: Lens<T>,
     types: DataType[],
     canEdit: boolean
 ): boolean {
@@ -65,7 +65,8 @@ export function registerWidget(widget: Widget) {
 }
 ALL_WIDGETS.forEach(registerWidget);
 
-export function registerLens(lens: Lens) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function registerLens(lens: Lens<any>) {
     useComponentsStore.setState((state) => {
         const lensesByKey = { ...state.lensesByKey, [lens.key]: lens };
         return {