From 032b4bcefb92e0928a7e465de192046db5b4f1ce Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 18 Nov 2024 15:34:19 -0800
Subject: [PATCH] Fix inline input

---
 src/app/components/PrimaryNav.svelte     |  2 +-
 src/lib/components/FieldInline.svelte    |  2 +-
 src/lib/editor/LinkExtension.ts          |  3 +--
 src/routes/settings/profile/+page.svelte | 10 +++++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 974c679..357302d 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -21,7 +21,7 @@
   const showSettingsMenu = () => pushModal(MenuSettings)
 </script>
 
-<div class="relative hidden w-14 flex-shrink-0 bg-base-200 pt-4 md:block">
+<div class="relative z-nav hidden w-14 flex-shrink-0 bg-base-200 pt-4 md:block">
   <div class="flex h-full flex-col justify-between">
     <div>
       {#if PLATFORM_RELAY}
diff --git a/src/lib/components/FieldInline.svelte b/src/lib/components/FieldInline.svelte
index adc2ca9..78aa5cd 100644
--- a/src/lib/components/FieldInline.svelte
+++ b/src/lib/components/FieldInline.svelte
@@ -1,4 +1,4 @@
-<div class="grid grid-cols-1 gap-2 sm:grid-cols-2 {$$props.class}">
+<div class="grid grid-cols-1 gap-2 lg:grid-cols-2 {$$props.class}">
   <label class="flex items-center gap-2 font-bold">
     <slot name="label" />
   </label>
diff --git a/src/lib/editor/LinkExtension.ts b/src/lib/editor/LinkExtension.ts
index bbc399f..c0049b1 100644
--- a/src/lib/editor/LinkExtension.ts
+++ b/src/lib/editor/LinkExtension.ts
@@ -4,8 +4,7 @@ import type {Node as ProsemirrorNode} from "@tiptap/pm/model"
 import type {MarkdownSerializerState} from "prosemirror-markdown"
 import {createPasteRuleMatch} from "./util"
 
-export const LINK_REGEX =
-  /([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s]*[^<>"'\.!?,:\s\)\(]*/gi
+export const LINK_REGEX = /([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s<>"'\.!?,:\)\(]*/gi
 
 export interface LinkAttributes {
   url: string
diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte
index e8663b3..6d3eb8c 100644
--- a/src/routes/settings/profile/+page.svelte
+++ b/src/routes/settings/profile/+page.svelte
@@ -52,9 +52,13 @@
   <div class="card2 bg-alt col-4 shadow-xl">
     <FieldInline>
       <p slot="label">Public Key</p>
-      <label class="input input-bordered flex w-full items-center gap-2" slot="input">
-        <Icon icon="link-round" />
-        <input class="ellipsize" value={$session?.pubkey} />
+      <label
+        class="input input-bordered flex w-full items-center justify-between gap-2"
+        slot="input">
+        <div class="row-2 flex-grow items-center">
+          <Icon icon="link-round" />
+          <input class="ellipsize flex-grow" value={$session?.pubkey} />
+        </div>
         <Button class="flex items-center" on:click={copyNpub}>
           <Icon icon="copy" />
         </Button>