From efee0f93119f5cd7e030a00651573141b1673140 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Wed, 28 Jun 2023 11:21:58 -0700
Subject: [PATCH] Disable fly on safari

---
 src/app/App.svelte                     | 8 +++-----
 src/app/ForegroundButtons.svelte       | 2 +-
 src/app/Toast.svelte                   | 2 +-
 src/app/shared/Feed.svelte             | 2 +-
 src/app/shared/FeedControls.svelte     | 2 +-
 src/app/shared/NoteContentQuote.svelte | 2 +-
 src/app/shared/NoteReply.svelte        | 2 +-
 src/app/shared/PersonInfo.svelte       | 2 +-
 src/app/shared/PersonRelays.svelte     | 2 +-
 src/app/shared/PersonStats.svelte      | 2 +-
 src/app/shared/RelayCard.svelte        | 2 +-
 src/app/views/Apps.svelte              | 2 +-
 src/app/views/ChatEdit.svelte          | 2 +-
 src/app/views/ChatListItem.svelte      | 2 +-
 src/app/views/Login.svelte             | 2 +-
 src/app/views/Logout.svelte            | 2 +-
 src/app/views/NoteCreate.svelte        | 2 +-
 src/app/views/NoteDetail.svelte        | 2 +-
 src/app/views/Notifications.svelte     | 2 +-
 src/app/views/Onboarding.svelte        | 2 +-
 src/app/views/PersonProfileInfo.svelte | 2 +-
 src/app/views/RelayList.svelte         | 2 +-
 src/app/views/RelayReview.svelte       | 2 +-
 src/app/views/UserKeys.svelte          | 2 +-
 src/app/views/UserProfile.svelte       | 2 +-
 src/app/views/UserSettings.svelte      | 2 +-
 src/partials/Card.svelte               | 2 +-
 src/partials/Channel.svelte            | 2 +-
 src/partials/Modal.svelte              | 2 +-
 src/partials/Spinner.svelte            | 2 +-
 src/partials/Suggestions.svelte        | 2 +-
 src/partials/Tabs.svelte               | 2 +-
 src/util/transition.ts                 | 9 +++++++++
 33 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 src/util/transition.ts

diff --git a/src/app/App.svelte b/src/app/App.svelte
index dca76c03..7311cea9 100644
--- a/src/app/App.svelte
+++ b/src/app/App.svelte
@@ -40,11 +40,9 @@
   $: style.textContent = `:root { ${getThemeVariables($theme)}; background: var(--gray-8); }`
 
   tryFunc(() =>
-    (navigator.registerProtocolHandler as (scheme: string, handler: string, name: string) => void)(
-      "web+nostr",
-      `${location.origin}/%s`,
-      appName
-    )
+    (
+      navigator.registerProtocolHandler as (scheme: string, handler: string, name: string) => void
+    )?.("web+nostr", `${location.origin}/%s`, appName)
   )
 
   const seenChallenges = new Set()
diff --git a/src/app/ForegroundButtons.svelte b/src/app/ForegroundButtons.svelte
index 8e289e3c..89b1a516 100644
--- a/src/app/ForegroundButtons.svelte
+++ b/src/app/ForegroundButtons.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {nip19} from "nostr-tools"
   import {navigate} from "svelte-routing"
-  import {fade} from "svelte/transition"
+  import {fade} from "src/util/transition"
   import user from "src/agent/user"
   import {modal, location} from "src/partials/state"
 
diff --git a/src/app/Toast.svelte b/src/app/Toast.svelte
index f09bf903..5df4c425 100644
--- a/src/app/Toast.svelte
+++ b/src/app/Toast.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import cx from "classnames"
   import {is} from "ramda"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {toast} from "src/partials/state"
 </script>
 
diff --git a/src/app/shared/Feed.svelte b/src/app/shared/Feed.svelte
index ce6e25e1..4dd91c21 100644
--- a/src/app/shared/Feed.svelte
+++ b/src/app/shared/Feed.svelte
@@ -3,7 +3,7 @@
   import {onMount, onDestroy} from "svelte"
   import {debounce} from "throttle-debounce"
   import {last, equals, partition, always, uniqBy, sortBy, prop} from "ramda"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {quantify} from "hurdak/lib/hurdak"
   import {fuzzy, createScroller, now, timedelta} from "src/util/misc"
   import {asDisplayEvent, noteKinds} from "src/util/nostr"
diff --git a/src/app/shared/FeedControls.svelte b/src/app/shared/FeedControls.svelte
index 04015626..1bbb467d 100644
--- a/src/app/shared/FeedControls.svelte
+++ b/src/app/shared/FeedControls.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type {DynamicFilter} from "src/util/types"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {pluck, omit, objOf} from "ramda"
   import {debounce} from "throttle-debounce"
   import {createLocalDate, formatTimestampAsDate} from "src/util/misc"
diff --git a/src/app/shared/NoteContentQuote.svelte b/src/app/shared/NoteContentQuote.svelte
index f97e1bd2..aca7b679 100644
--- a/src/app/shared/NoteContentQuote.svelte
+++ b/src/app/shared/NoteContentQuote.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {objOf} from "ramda"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {warn} from "src/util/logger"
   import {displayPerson, Tags} from "src/util/nostr"
   import {modal} from "src/partials/state"
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 4a36e6fc..e8bc2740 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -2,7 +2,7 @@
   import {nip19} from "nostr-tools"
   import {createEventDispatcher} from "svelte"
   import {without, pluck, uniq} from "ramda"
-  import {slide} from "svelte/transition"
+  import {slide} from "src/util/transition"
   import {Tags, displayPerson} from "src/util/nostr"
   import {toast} from "src/partials/state"
   import ImageInput from "src/partials/ImageInput.svelte"
diff --git a/src/app/shared/PersonInfo.svelte b/src/app/shared/PersonInfo.svelte
index 4cec9ccb..124b634f 100644
--- a/src/app/shared/PersonInfo.svelte
+++ b/src/app/shared/PersonInfo.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {last, nth} from "ramda"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {displayPerson} from "src/util/nostr"
   import {modal} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
diff --git a/src/app/shared/PersonRelays.svelte b/src/app/shared/PersonRelays.svelte
index 2aa2785e..848217d3 100644
--- a/src/app/shared/PersonRelays.svelte
+++ b/src/app/shared/PersonRelays.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import Content from "src/partials/Content.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
 
diff --git a/src/app/shared/PersonStats.svelte b/src/app/shared/PersonStats.svelte
index 92bcdbc0..2b207305 100644
--- a/src/app/shared/PersonStats.svelte
+++ b/src/app/shared/PersonStats.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {tweened} from "svelte/motion"
   import {numberFmt} from "src/util/misc"
   import {modal} from "src/partials/state"
diff --git a/src/app/shared/RelayCard.svelte b/src/app/shared/RelayCard.svelte
index 80b29949..32aeabe1 100644
--- a/src/app/shared/RelayCard.svelte
+++ b/src/app/shared/RelayCard.svelte
@@ -3,7 +3,7 @@
   import {find, propEq} from "ramda"
   import {between} from "hurdak/lib/hurdak"
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {poll, stringToHue, hsl} from "src/util/misc"
   import {displayRelay} from "src/util/nostr"
   import {modal} from "src/partials/state"
diff --git a/src/app/views/Apps.svelte b/src/app/views/Apps.svelte
index 28f51b41..33f760fa 100644
--- a/src/app/views/Apps.svelte
+++ b/src/app/views/Apps.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import Media from "src/partials/Media.svelte"
   import Card from "src/partials/Card.svelte"
   import Heading from "src/partials/Heading.svelte"
diff --git a/src/app/views/ChatEdit.svelte b/src/app/views/ChatEdit.svelte
index 878707ca..8bce3ea2 100644
--- a/src/app/views/ChatEdit.svelte
+++ b/src/app/views/ChatEdit.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {error} from "src/util/logger"
   import {stripExifData} from "src/util/html"
   import Input from "src/partials/Input.svelte"
diff --git a/src/app/views/ChatListItem.svelte b/src/app/views/ChatListItem.svelte
index 4e72870b..09dc4e57 100644
--- a/src/app/views/ChatListItem.svelte
+++ b/src/app/views/ChatListItem.svelte
@@ -1,7 +1,7 @@
 <script>
   import {nip19} from "nostr-tools"
   import {navigate} from "svelte-routing"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {ellipsize} from "hurdak/lib/hurdak"
   import Anchor from "src/partials/Anchor.svelte"
   import user from "src/agent/user"
diff --git a/src/app/views/Login.svelte b/src/app/views/Login.svelte
index b0c916ec..3b49bbae 100644
--- a/src/app/views/Login.svelte
+++ b/src/app/views/Login.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {Capacitor} from "@capacitor/core"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {navigate} from "svelte-routing"
   import {modal} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
diff --git a/src/app/views/Logout.svelte b/src/app/views/Logout.svelte
index 5fb0c000..ed583938 100644
--- a/src/app/views/Logout.svelte
+++ b/src/app/views/Logout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import {dropAll} from "src/agent/db"
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 7275c9fd..a8cd8630 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -2,7 +2,7 @@
   import {onMount} from "svelte"
   import {nip19} from "nostr-tools"
   import {last, reject, pluck, propEq} from "ramda"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {writable} from "svelte/store"
   import {annotateMedia} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
diff --git a/src/app/views/NoteDetail.svelte b/src/app/views/NoteDetail.svelte
index ff541667..7b19cc26 100644
--- a/src/app/views/NoteDetail.svelte
+++ b/src/app/views/NoteDetail.svelte
@@ -1,7 +1,7 @@
 <script>
   import {onMount, onDestroy} from "svelte"
   import {nip19} from "nostr-tools"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {first} from "hurdak/lib/hurdak"
   import {log} from "src/util/logger"
   import {isMobile} from "src/util/html"
diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
index 250842bc..ec2c337b 100644
--- a/src/app/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -2,7 +2,7 @@
   import {throttle} from "throttle-debounce"
   import {pluck, reverse, max, last, sortBy} from "ramda"
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {navigate} from "svelte-routing"
   import {
     now,
diff --git a/src/app/views/Onboarding.svelte b/src/app/views/Onboarding.svelte
index d135acbf..f93490b6 100644
--- a/src/app/views/Onboarding.svelte
+++ b/src/app/views/Onboarding.svelte
@@ -2,7 +2,7 @@
   import {uniq} from "ramda"
   import {onMount} from "svelte"
   import {generatePrivateKey} from "nostr-tools"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {navigate} from "svelte-routing"
   import {shuffle} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
diff --git a/src/app/views/PersonProfileInfo.svelte b/src/app/views/PersonProfileInfo.svelte
index 121ef1f1..0d00de99 100644
--- a/src/app/views/PersonProfileInfo.svelte
+++ b/src/app/views/PersonProfileInfo.svelte
@@ -4,7 +4,7 @@
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
 
   export let person
 
diff --git a/src/app/views/RelayList.svelte b/src/app/views/RelayList.svelte
index 6d0c4ba2..c4c50027 100644
--- a/src/app/views/RelayList.svelte
+++ b/src/app/views/RelayList.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
diff --git a/src/app/views/RelayReview.svelte b/src/app/views/RelayReview.svelte
index 1b52d5ea..feb5c4fe 100644
--- a/src/app/views/RelayReview.svelte
+++ b/src/app/views/RelayReview.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {modal} from "src/partials/state"
   import Button from "src/partials/Button.svelte"
   import Content from "src/partials/Content.svelte"
diff --git a/src/app/views/UserKeys.svelte b/src/app/views/UserKeys.svelte
index 379c796b..96cdc2af 100644
--- a/src/app/views/UserKeys.svelte
+++ b/src/app/views/UserKeys.svelte
@@ -1,6 +1,6 @@
 <script>
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {navigate} from "svelte-routing"
   import {nip19} from "nostr-tools"
   import {copyToClipboard} from "src/util/html"
diff --git a/src/app/views/UserProfile.svelte b/src/app/views/UserProfile.svelte
index baeaa856..2e687a3d 100644
--- a/src/app/views/UserProfile.svelte
+++ b/src/app/views/UserProfile.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {navigate} from "svelte-routing"
   import Input from "src/partials/Input.svelte"
   import ImageInput from "src/partials/ImageInput.svelte"
diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index a4b8009b..52477adc 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {toast, appName} from "src/partials/state"
   import Toggle from "src/partials/Toggle.svelte"
   import Anchor from "src/partials/Anchor.svelte"
diff --git a/src/partials/Card.svelte b/src/partials/Card.svelte
index e0f2d69c..6a427008 100644
--- a/src/partials/Card.svelte
+++ b/src/partials/Card.svelte
@@ -1,6 +1,6 @@
 <script>
   import cx from "classnames"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
 
   export let interactive = false
   export let invertColors = false
diff --git a/src/partials/Channel.svelte b/src/partials/Channel.svelte
index b32a0a31..df792a39 100644
--- a/src/partials/Channel.svelte
+++ b/src/partials/Channel.svelte
@@ -1,6 +1,6 @@
 <script>
   import {onMount} from "svelte"
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {prop, max, path as getPath, reverse, pluck, uniqBy, sortBy, last} from "ramda"
   import {sleep, createScroller} from "src/util/misc"
   import Spinner from "src/partials/Spinner.svelte"
diff --git a/src/partials/Modal.svelte b/src/partials/Modal.svelte
index 9a1640bd..12f82ecc 100644
--- a/src/partials/Modal.svelte
+++ b/src/partials/Modal.svelte
@@ -1,7 +1,7 @@
 <script>
   import {randomId} from "hurdak/lib/hurdak"
   import {onMount, onDestroy} from "svelte"
-  import {fly, fade} from "svelte/transition"
+  import {fly, fade} from "src/util/transition"
   import {modal} from "src/partials/state"
 
   export let mini = false
diff --git a/src/partials/Spinner.svelte b/src/partials/Spinner.svelte
index c488465b..1cfc8518 100644
--- a/src/partials/Spinner.svelte
+++ b/src/partials/Spinner.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fade} from "svelte/transition"
+  import {fade} from "src/util/transition"
   import {Circle2} from "svelte-loading-spinners"
 
   export let delay = 1000
diff --git a/src/partials/Suggestions.svelte b/src/partials/Suggestions.svelte
index 58f6a697..f6f13cdf 100644
--- a/src/partials/Suggestions.svelte
+++ b/src/partials/Suggestions.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
 
   export let select
 
diff --git a/src/partials/Tabs.svelte b/src/partials/Tabs.svelte
index f9e2b2c5..b523f896 100644
--- a/src/partials/Tabs.svelte
+++ b/src/partials/Tabs.svelte
@@ -1,5 +1,5 @@
 <script>
-  import {fly} from "svelte/transition"
+  import {fly} from "src/util/transition"
   import {toTitle} from "hurdak/lib/hurdak"
 
   export let tabs
diff --git a/src/util/transition.ts b/src/util/transition.ts
new file mode 100644
index 00000000..41517a86
--- /dev/null
+++ b/src/util/transition.ts
@@ -0,0 +1,9 @@
+import * as t from "svelte/transition"
+
+// Fly animation kills safari for some reason, use a modified fade instead
+// @ts-ignore
+export const fly = window.safari
+  ? (node, params) => t.fade(node, {duration: 100, ...params})
+  : t.fly
+export const fade = t.fade
+export const slide = t.slide