Update grid width calculation

GMOD · Jul 27, 2022 · abb4cd0 · abb4cd0
1 parent 18fbef1
commit abb4cd0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail.tsx b/packages/core/BaseFeatureWidget/BaseFeatureDetail.tsx
@@ -23,6 +23,7 @@ import {
   measureGridWidth,
   getSession,
   getStr,
+  getUriLink,
   isUriLocation,
 } from '../util'
 import SanitizedHTML from '../ui/SanitizedHTML'
@@ -320,13 +321,7 @@ export function UriLink({
 }: {
   value: { uri: string; baseUri?: string }
 }) {
-  const { uri, baseUri = '' } = value
-  let href
-  try {
-    href = new URL(uri, baseUri).href
-  } catch (e) {
-    href = uri
-  }
+  const href = getUriLink(value)
   return <SanitizedHTML html={`<a href="${href}">${href}</a>`} />
 }
 const DataGridDetails = ({

diff --git a/packages/core/util/index.ts b/packages/core/util/index.ts
@@ -1128,10 +1128,21 @@ export const useLocalStorage = (key: string, defaultValue = '') => {
   return [value, setValue] as [string, (arg: string) => void]
 }
 
+export function getUriLink(value: { uri: string; baseUri?: string }) {
+  const { uri, baseUri = '' } = value
+  let href
+  try {
+    href = new URL(uri, baseUri).href
+  } catch (e) {
+    href = uri
+  }
+  return href
+}
+
 export function getStr(obj: unknown) {
   return isObject(obj)
     ? isUriLocation(obj)
-      ? obj.uri
+      ? getUriLink(obj)
       : JSON.stringify(obj)
     : String(obj)
 }