chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1

packages/api/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.26.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2024-05-07)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.26.89",
+  "version": "1.26.92",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/clipper/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.528](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.527](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.526](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.525](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.524](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.523](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.522](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.521](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.520](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.519](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.518](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.517](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
 
 **Note:** Version bump only for package @standardnotes/clipper

packages/clipper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/clipper",
   "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.517",
+  "version": "1.1.528",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

packages/desktop/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.110.133](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.132](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.131](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.130](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.129](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.128](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.127](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.126](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.125](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.124](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.123](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.110.122](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.110.122",
+  "version": "3.110.133",
   "license": "AGPL-3.0",
   "author": "Standard Notes.",
   "private": true,

packages/encryption/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.110](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.109](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.108](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.21.107](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2024-05-07)
 
 **Note:** Version bump only for package @standardnotes/encryption

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.21.107",
+  "version": "1.21.110",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.28.130](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.129](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.128](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.28.127](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-04-25)
 
 ### Bug Fixes

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.28.127",
+  "version": "1.28.130",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.20.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.20.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.20.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2024-05-07)
 
 **Note:** Version bump only for package @standardnotes/files

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.20.10",
+  "version": "1.20.13",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/mobile/CHANGELOG.md

@@ -3,6 +3,58 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.58.190](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.189](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+### Bug Fixes
+
+* Fixed issue with UI sometimes getting shifted up on iOS ([c050a2c](https://github.com/standardnotes/app/commit/c050a2cd339bb7a8fd482904216de1db2b8fe568))
+
+## [3.58.188](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.187](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+### Bug Fixes
+
+* Fixed issue where Android app would crash on screen rotation ([#2905](https://github.com/standardnotes/app/issues/2905)) ([9c1bb35](https://github.com/standardnotes/app/commit/9c1bb353550c0256b4e6dcbee1e087cc9ffdd628))
+
+## [3.58.186](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.185](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.184](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.183](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.182](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.181](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.180](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.179](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.58.178](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/android/app/src/main/java/com/standardnotes/MainActivity.java

@@ -37,13 +37,6 @@ public class MainActivity extends ReactActivity {
         DefaultNewArchitectureEntryPoint.getFabricEnabled());
     }
 
-    // Fix for Dark theme subscriptions https://github.com/facebook/react-native/issues/28823#issuecomment-642032481
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        getReactInstanceManager().onConfigurationChanged(this, newConfig);
-    }
-
     /*
      On back button press, background app instead of quitting it
      https://github.com/facebook/react-native/issues/13775

packages/mobile/ios/Podfile.lock

@@ -1668,8 +1668,27 @@ PODS:
     - RCTTypeSafety
     - React-Core
     - ReactCommon/turbomodule/core
-  - RNKeychain (8.1.2):
+  - RNKeychain (10.0.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.11.18.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - RNNotifee (9.1.8):
     - React-Core
     - RNNotifee/NotifeeCore (= 9.1.8)
@@ -2056,7 +2075,7 @@ SPEC CHECKSUMS:
   RNFileViewer: 4b5d83358214347e4ab2d4ca8d5c1c90d869e251
   RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
   RNIap: d73cedfb73b396cad75f90f4ed7d64352d6381cf
-  RNKeychain: df33ae4d27df06622fc14190b790ba8749f6be76
+  RNKeychain: 455cc7002480eac3d24f67b4329ec80c7d901edc
   RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168
   RNPrivacySnapshot: ccad3a548338c2f526bb7b1789af3fb0618b7d1d
   RNShare: 56b5431c60e1e9ee167191f4f327471af1c2941a

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.58.178",
+  "version": "3.58.190",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0",
@@ -63,7 +63,7 @@
     "react-native-flag-secure-android": "standardnotes/react-native-flag-secure-android#cb08e74583c22a5d912842459b35ebbbb4bcd852",
     "react-native-fs": "^2.20.0",
     "react-native-iap": "^12.16.2",
-    "react-native-keychain": "standardnotes/react-native-keychain#4fd687461cecfa26d482d820ee43c0de61b964d4",
+    "react-native-keychain": "standardnotes/react-native-keychain#618c3e1f253e6980866ee02a80c3ea66fa6f5bad",
     "react-native-mmkv": "^3.2.0",
     "react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe",
     "react-native-share": "^12.0.9",

packages/mobile/src/MobileWebAppContainer.tsx

@@ -43,6 +43,7 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
   const _reviewService = useRef(new ReviewService(device))
 
   const [showAndroidWebviewUpdatePrompt, setShowAndroidWebviewUpdatePrompt] = useState(false)
+  const [didLoadEnd, setDidLoadEnd] = useState(false)
 
   const insets = useSafeAreaInsets()
 
@@ -136,7 +137,7 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
       keyboardDidHideListener.remove()
       keyboardWillChangeFrame.remove()
     }
-  }, [webViewRef, stateService, device, androidBackHandlerService, colorSchemeService])
+  }, [webViewRef, stateService, device, androidBackHandlerService, colorSchemeService, insets.bottom])
 
   useEffect(() => {
     return notifee.onForegroundEvent(({ type, detail }) => {
@@ -354,30 +355,22 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
     }
   }, [])
 
-  const [didAppLaunch, setDidAppLaunch] = useState(false)
   useEffect(() => {
     return device.addApplicationEventReceiver((event) => {
       if (event === ApplicationEvent.Launched) {
         receivedSharedItemsHandler.current.setIsApplicationLaunched(true)
-        setDidAppLaunch(true)
       }
     })
   }, [device])
 
-  useEffect(() => {
-    if (!didAppLaunch) {
-      return
-    }
-    webViewRef.current?.postMessage(
-      JSON.stringify({
-        reactNativeEvent: ReactNativeToWebEvent.UpdateSafeAreaInsets,
-        messageType: 'event',
-        messageData: insets,
-      }),
-    )
-  }, [didAppLaunch, insets])
-
-  const [didLoadEnd, setDidLoadEnd] = useState(false)
+  const injectJS = `
+    document.documentElement.style.setProperty('--safe-area-inset-top', '${insets.top}px');
+    document.documentElement.style.setProperty('--safe-area-inset-bottom', '${insets.bottom}px');
+    document.documentElement.style.setProperty('--safe-area-inset-left', '${insets.left}px');
+    document.documentElement.style.setProperty('--safe-area-inset-right', '${insets.right}px');
+    true;
+  `
+  webViewRef.current?.injectJavaScript(injectJS)
 
   if (showAndroidWebviewUpdatePrompt) {
     return (

packages/models/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.58.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+### Features
+
+* Tag search will now only show the direct tag results instead of also showing the parent and siblings ([#2906](https://github.com/standardnotes/app/issues/2906)) ([caa8eff](https://github.com/standardnotes/app/commit/caa8eff216b2d7a47f849f85f1eb2248eea10c62))
+
+## [1.57.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/models
+
+# [1.57.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+### Features
+
+* Added image alignment options and preference in Super notes ([#2903](https://github.com/standardnotes/app/issues/2903)) ([7bce025](https://github.com/standardnotes/app/commit/7bce025efbab6d57c4dabb8354d400c87eb90032))
+
 ## [1.56.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2024-05-07)
 
 **Note:** Version bump only for package @standardnotes/models

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.56.1",
+  "version": "1.58.0",
   "publishConfig": {
     "access": "public"
   },

packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts

@@ -38,8 +38,11 @@ export function itemMatchesQuery(
   searchQuery: SearchQuery,
   collection: ReferenceLookupCollection,
 ): boolean {
+  const shouldCheckForSomeTagMatches = searchQuery.shouldCheckForSomeTagMatches ?? true
   const itemTags = collection.elementsReferencingElement(itemToMatch, ContentType.TYPES.Tag) as SNTag[]
-  const someTagsMatches = itemTags.some((tag) => matchResultForStringQuery(tag, searchQuery.query) !== MatchResult.None)
+  const someTagsMatches =
+    shouldCheckForSomeTagMatches &&
+    itemTags.some((tag) => matchResultForStringQuery(tag, searchQuery.query) !== MatchResult.None)
 
   if (itemToMatch.protected && !searchQuery.includeProtectedNoteText) {
     const match = matchResultForStringQuery(itemToMatch, searchQuery.query)

packages/models/src/Domain/Runtime/Display/Search/Types.ts

@@ -5,6 +5,7 @@ import { SearchableItem } from './SearchableItem'
 export type SearchQuery = {
   query: string
   includeProtectedNoteText: boolean
+  shouldCheckForSomeTagMatches?: boolean
 }
 
 export interface ReferenceLookupCollection {

packages/models/src/Domain/Syncable/UserPrefs/PrefDefaults.ts

@@ -43,6 +43,7 @@ export const PrefDefaults = {
   [PrefKey.SuperNoteExportEmbedBehavior]: 'reference',
   [PrefKey.SuperNoteExportUseMDFrontmatter]: true,
   [PrefKey.SuperNoteExportPDFPageSize]: 'A4',
+  [PrefKey.SuperNoteImageAlignment]: 'left',
   [PrefKey.SystemViewPreferences]: {},
   [PrefKey.AuthenticatorNames]: '',
   [PrefKey.ComponentPreferences]: {},

packages/models/src/Domain/Syncable/UserPrefs/PrefKey.ts

@@ -36,6 +36,7 @@ export enum PrefKey {
   SuperNoteExportEmbedBehavior = 'superNoteExportEmbedBehavior',
   SuperNoteExportUseMDFrontmatter = 'superNoteExportUseMDFrontmatter',
   SuperNoteExportPDFPageSize = 'superNoteExportPDFPageSize',
+  SuperNoteImageAlignment = 'superNoteImageAlignment',
   AuthenticatorNames = 'authenticatorNames',
   PaneGesturesEnabled = 'paneGesturesEnabled',
   ComponentPreferences = 'componentPreferences',
@@ -101,4 +102,5 @@ export type PrefValue = {
   [PrefKey.AddImportsToTag]: boolean
   [PrefKey.AlwaysCreateNewTagForImports]: boolean
   [PrefKey.ExistingTagForImports]: string | undefined
+  [PrefKey.SuperNoteImageAlignment]: 'left' | 'center' | 'right'
 }

packages/releases/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.830](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.829](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.828](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.827](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.826](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.825](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.824](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.823](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.822](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.821](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.820](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.819](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.818](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.818",
+  "version": "1.4.830",
   "license": "AGPL-3.0",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/services/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.71.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.71.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.71.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.71.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-02)
 
 ### Bug Fixes

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.71.5",
+  "version": "1.71.8",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/snjs/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.209.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+### Bug Fixes
+
+* Fixed issue with UI sometimes getting shifted up on iOS ([c050a2c](https://github.com/standardnotes/app/commit/c050a2cd339bb7a8fd482904216de1db2b8fe568))
+
+## [2.209.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.209.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 ## [2.209.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-02)
 
 **Note:** Version bump only for package @standardnotes/snjs

packages/snjs/lib/Client/ReactNativeToWebEvent.ts

@@ -10,7 +10,6 @@ export enum ReactNativeToWebEvent {
   KeyboardWillHide = 'KeyboardWillHide',
   KeyboardDidShow = 'KeyboardDidShow',
   KeyboardDidHide = 'KeyboardDidHide',
-  UpdateSafeAreaInsets = 'UpdateSafeAreaInsets',
   ReceivedFile = 'ReceivedFile',
   ReceivedLink = 'ReceivedLink',
   ReceivedText = 'ReceivedText',

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.209.8",
+  "version": "2.209.11",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+### Bug Fixes
+
+* Fixed issue with UI sometimes getting shifted up on iOS ([c050a2c](https://github.com/standardnotes/app/commit/c050a2cd339bb7a8fd482904216de1db2b8fe568))
+
+## [1.38.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.38.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.38.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-02)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.38.6",
+  "version": "1.38.9",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/src/WebApplication/WebApplicationInterface.ts

@@ -21,7 +21,6 @@ export interface WebApplicationInterface extends ApplicationInterface {
     isFloatingKeyboard: boolean
   }): void
   handleMobileKeyboardDidHideEvent(): void
-  handleUpdateSafeAreaInsets(insets: { top: number; bottom: number; left: number; right: number }): void
   handleReceivedFileEvent(file: { name: string; mimeType: string; data: string }): void
   handleReceivedTextEvent(item: { text: string; title?: string }): Promise<void>
   handleReceivedLinkEvent(item: { link: string; title: string }): Promise<void>

packages/utils/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/utils
+
 ## [1.17.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2024-05-07)
 
 **Note:** Version bump only for package @standardnotes/utils

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/utils",
-  "version": "1.17.13",
+  "version": "1.17.14",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/utils/src/Domain/Utils/Utils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { sanitize } from 'dompurify'
-import { find, isArray, mergeWith, remove, uniq, uniqWith } from 'lodash'
+import { escape, find, isArray, mergeWith, remove, uniq, uniqWith } from 'lodash'
 import { AnyRecord } from '@standardnotes/common'
 
 const collator = typeof Intl !== 'undefined' ? new Intl.Collator('en', { numeric: true }) : undefined
@@ -612,6 +612,10 @@ export function sanitizeHtmlString(html: string): string {
   return sanitize(html)
 }
 
+export function escapeHtmlString(html: string): string {
+  return escape(html)
+}
+
 let sharedDateFormatter: unknown
 export function dateToLocalizedString(date: Date): string {
   if (typeof Intl !== 'undefined' && Intl.DateTimeFormat && typeof navigator !== 'undefined') {

packages/web/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.198.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.198.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)
+
+### Bug Fixes
+
+* Fixed issue with UI sometimes getting shifted up on iOS ([c050a2c](https://github.com/standardnotes/app/commit/c050a2cd339bb7a8fd482904216de1db2b8fe568))
+
+### Features
+
+* Tag search will now only show the direct tag results instead of also showing the parent and siblings ([#2906](https://github.com/standardnotes/app/issues/2906)) ([caa8eff](https://github.com/standardnotes/app/commit/caa8eff216b2d7a47f849f85f1eb2248eea10c62))
+
+## [3.197.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.197.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+### Bug Fixes
+
+* Fixed issue where Android app would crash on screen rotation ([#2905](https://github.com/standardnotes/app/issues/2905)) ([9c1bb35](https://github.com/standardnotes/app/commit/9c1bb353550c0256b4e6dcbee1e087cc9ffdd628))
+
+## [3.197.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.197.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.197.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)
+
+### Features
+
+* Added image alignment options and preference in Super notes ([#2903](https://github.com/standardnotes/app/issues/2903)) ([7bce025](https://github.com/standardnotes/app/commit/7bce025efbab6d57c4dabb8354d400c87eb90032))
+
+## [3.196.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.196.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.196.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.196.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
+
+**Note:** Version bump only for package @standardnotes/web
+
 ## [3.196.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/CHANGELOG.md.json

@@ -1,5 +1,139 @@
 {
   "versions": [
+    {
+      "version": "3.198.1",
+      "title": "[3.198.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.198.0",
+      "title": "[3.198.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-24)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue with UI sometimes getting shifted up on iOS ([c050a2c](https://github.com/standardnotes/app/commit/c050a2cd339bb7a8fd482904216de1db2b8fe568))\n\n### Features\n\n* Tag search will now only show the direct tag results instead of also showing the parent and siblings ([#2906](https://github.com/standardnotes/app/issues/2906)) ([caa8eff](https://github.com/standardnotes/app/commit/caa8eff216b2d7a47f849f85f1eb2248eea10c62))",
+      "parsed": {
+        "_": [
+          "Fixed issue with UI sometimes getting shifted up on iOS (c050a2c)",
+          "Tag search will now only show the direct tag results instead of also showing the parent and siblings (#2906) (caa8eff)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue with UI sometimes getting shifted up on iOS (c050a2c)"
+        ],
+        "Features": [
+          "Tag search will now only show the direct tag results instead of also showing the parent and siblings (#2906) (caa8eff)"
+        ]
+      }
+    },
+    {
+      "version": "3.197.4",
+      "title": "[3.197.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-22)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.197.3",
+      "title": "[3.197.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where Android app would crash on screen rotation ([#2905](https://github.com/standardnotes/app/issues/2905)) ([9c1bb35](https://github.com/standardnotes/app/commit/9c1bb353550c0256b4e6dcbee1e087cc9ffdd628))",
+      "parsed": {
+        "_": [
+          "Fixed issue where Android app would crash on screen rotation (#2905) (9c1bb35)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where Android app would crash on screen rotation (#2905) (9c1bb35)"
+        ]
+      }
+    },
+    {
+      "version": "3.197.2",
+      "title": "[3.197.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-19)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.197.1",
+      "title": "[3.197.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-18)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.197.0",
+      "title": "[3.197.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-16)",
+      "date": null,
+      "body": "### Features\n\n* Added image alignment options and preference in Super notes ([#2903](https://github.com/standardnotes/app/issues/2903)) ([7bce025](https://github.com/standardnotes/app/commit/7bce025efbab6d57c4dabb8354d400c87eb90032))",
+      "parsed": {
+        "_": [
+          "Added image alignment options and preference in Super notes (#2903) (7bce025)"
+        ],
+        "Features": [
+          "Added image alignment options and preference in Super notes (#2903) (7bce025)"
+        ]
+      }
+    },
+    {
+      "version": "3.196.9",
+      "title": "[3.196.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-12)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.196.8",
+      "title": "[3.196.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-06-05)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.196.7",
+      "title": "[3.196.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-22)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.196.6",
+      "title": "[3.196.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
     {
       "version": "3.196.5",
       "title": "[3.196.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2025-05-12)",

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.196.5",
+  "version": "3.198.1",
   "license": "AGPL-3.0",
   "main": "dist/app.js",
   "author": "Standard Notes",
@@ -33,7 +33,7 @@
     "@standardnotes/authenticator": "^2.4.0",
     "@standardnotes/autobiography-theme": "^1.2.7",
     "@standardnotes/bold-editor": "^1.6.4",
-    "@standardnotes/classic-code-editor": "^1.5.7",
+    "@standardnotes/classic-code-editor": "^1.6.2",
     "@standardnotes/dynamic-theme": "^1.2.8",
     "@standardnotes/filepicker": "workspace:*",
     "@standardnotes/focus-theme": "^1.4.6",
@@ -108,17 +108,17 @@
   },
   "dependencies": {
     "@ariakit/react": "^0.3.9",
-    "@lexical/clipboard": "0.30.0",
-    "@lexical/headless": "0.30.0",
-    "@lexical/link": "0.30.0",
-    "@lexical/list": "0.30.0",
-    "@lexical/react": "0.30.0",
-    "@lexical/rich-text": "0.30.0",
-    "@lexical/utils": "0.30.0",
+    "@lexical/clipboard": "0.32.1",
+    "@lexical/headless": "0.32.1",
+    "@lexical/link": "0.32.1",
+    "@lexical/list": "0.32.1",
+    "@lexical/react": "0.32.1",
+    "@lexical/rich-text": "0.32.1",
+    "@lexical/utils": "0.32.1",
     "@radix-ui/react-slot": "^1.0.1",
     "@react-pdf/renderer": "^3.3.2",
     "comlink": "^4.4.1",
     "fast-diff": "^1.3.0",
-    "lexical": "0.30.0"
+    "lexical": "0.32.1"
   }
 }

packages/web/src/javascripts/Application/WebApplication.ts

@@ -361,12 +361,6 @@ export class WebApplication extends SNApplication implements WebApplicationInter
     setCustomViewportHeight(100, 'vh', true)
   }
 
-  handleUpdateSafeAreaInsets(insets: { top: number; bottom: number; left: number; right: number }) {
-    for (const [key, value] of Object.entries(insets)) {
-      document.documentElement.style.setProperty(`--safe-area-inset-${key}`, `${value}px`)
-    }
-  }
-
   handleOpenFilePreviewEvent({ id }: { id: string }): void {
     const file = this.items.findItem<FileItem>(id)
     if (!file) {

packages/web/src/javascripts/Components/Button/IconButton.tsx

@@ -1,8 +1,8 @@
-import { FunctionComponent, MouseEventHandler } from 'react'
+import { ComponentPropsWithoutRef, ForwardedRef, forwardRef, MouseEventHandler } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import { IconType } from '@standardnotes/snjs'
 
-type Props = {
+interface Props extends ComponentPropsWithoutRef<'button'> {
   onClick: MouseEventHandler<HTMLButtonElement>
   className?: string
   icon: IconType
@@ -12,32 +12,31 @@ type Props = {
   disabled?: boolean
 }
 
-const IconButton: FunctionComponent<Props> = ({
-  onClick,
-  className = '',
-  icon,
-  title,
-  focusable,
-  iconClassName = '',
-  disabled = false,
-}) => {
-  const click: MouseEventHandler<HTMLButtonElement> = (e) => {
-    e.preventDefault()
-    onClick(e)
-  }
-  const focusableClass = focusable ? '' : 'focus:shadow-none'
-  return (
-    <button
-      type="button"
-      title={title}
-      className={`no-border flex cursor-pointer flex-row items-center bg-transparent ${focusableClass} ${className}`}
-      onClick={click}
-      disabled={disabled}
-      aria-label={title}
-    >
-      <Icon type={icon} className={iconClassName} />
-    </button>
-  )
-}
+const IconButton = forwardRef(
+  (
+    { onClick, className = '', icon, title, focusable, iconClassName = '', disabled = false, ...rest }: Props,
+    ref: ForwardedRef<HTMLButtonElement>,
+  ) => {
+    const click: MouseEventHandler<HTMLButtonElement> = (e) => {
+      e.preventDefault()
+      onClick(e)
+    }
+    const focusableClass = focusable ? '' : 'focus:shadow-none'
+    return (
+      <button
+        {...rest}
+        type="button"
+        title={title}
+        className={`no-border flex cursor-pointer flex-row items-center bg-transparent ${focusableClass} ${className}`}
+        onClick={click}
+        disabled={disabled}
+        aria-label={title}
+        ref={ref}
+      >
+        <Icon type={icon} className={iconClassName} />
+      </button>
+    )
+  },
+)
 
 export default IconButton

packages/web/src/javascripts/Components/FilePreview/FilePreview.tsx

@@ -13,15 +13,23 @@ import { isFileTypePreviewable } from './isFilePreviewable'
 import PreviewComponent from './PreviewComponent'
 import Button from '../Button/Button'
 import { ProtectedIllustration } from '@standardnotes/icons'
-import { ImageZoomLevelProps } from './ImageZoomLevelProps'
+import { OptionalSuperEmbeddedImageProps } from './OptionalSuperEmbeddedImageProps'
 
 type Props = {
   application: WebApplication
   file: FileItem
   isEmbeddedInSuper?: boolean
-} & ImageZoomLevelProps
+} & OptionalSuperEmbeddedImageProps
 
-const FilePreview = ({ file, application, isEmbeddedInSuper = false, imageZoomLevel, setImageZoomLevel }: Props) => {
+const FilePreview = ({
+  file,
+  application,
+  isEmbeddedInSuper = false,
+  imageZoomLevel,
+  setImageZoomLevel,
+  alignment,
+  changeAlignment,
+}: Props) => {
   const [isAuthorized, setIsAuthorized] = useState(application.isAuthorizedToRenderItem(file))
 
   const isFilePreviewable = useMemo(() => {
@@ -137,6 +145,8 @@ const FilePreview = ({ file, application, isEmbeddedInSuper = false, imageZoomLe
       isEmbeddedInSuper={isEmbeddedInSuper}
       imageZoomLevel={imageZoomLevel}
       setImageZoomLevel={setImageZoomLevel}
+      alignment={alignment}
+      changeAlignment={changeAlignment}
     />
   ) : (
     <FilePreviewError

packages/web/src/javascripts/Components/FilePreview/ImageAlignmentOptions.tsx

@@ -0,0 +1,64 @@
+import { classNames, IconType } from '@standardnotes/snjs'
+import IconButton from '@/Components/Button/IconButton'
+import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'
+import { ElementFormatType } from 'lexical'
+
+export function getCSSValueFromAlignment(format: ElementFormatType) {
+  switch (format) {
+    case 'start':
+    case 'left':
+      return 'start'
+    case 'right':
+    case 'end':
+      return 'end'
+    default:
+      return 'center'
+  }
+}
+
+const Options = [
+  {
+    alignment: 'left',
+    label: 'Left align',
+  },
+  {
+    alignment: 'center',
+    label: 'Center align',
+  },
+  {
+    alignment: 'right',
+    label: 'Right align',
+  },
+]
+
+export function ImageAlignmentOptions({
+  alignment: currentAlignment,
+  changeAlignment,
+}: {
+  alignment: ElementFormatType
+  changeAlignment: (format: ElementFormatType) => void
+}) {
+  return Options.map(({ alignment, label }) => (
+    <StyledTooltip label={label} key={alignment}>
+      <IconButton
+        className={classNames(
+          alignment === currentAlignment && '!bg-info text-info-contrast',
+          'rounded p-1 hover:bg-contrast',
+        )}
+        icon={`format-align-${alignment}` as IconType}
+        title={label}
+        focusable={true}
+        onClick={(e) => {
+          // the preventDefault and stopPropagation for these events are required
+          // so that the keyboard doesn't jump when you select another option
+          e.preventDefault()
+          e.stopPropagation()
+          changeAlignment(alignment as ElementFormatType)
+        }}
+        onMouseDown={(e) => {
+          e.preventDefault()
+        }}
+      />
+    </StyledTooltip>
+  ))
+}

packages/web/src/javascripts/Components/FilePreview/ImagePreview.tsx

@@ -1,12 +1,16 @@
-import { classNames, IconType } from '@standardnotes/snjs'
+import { IconType, PrefKey } from '@standardnotes/snjs'
 import { FunctionComponent, useCallback, useEffect, useState } from 'react'
-import IconButton from '../Button/IconButton'
-import { ImageZoomLevelProps } from './ImageZoomLevelProps'
+import IconButton from '@/Components/Button/IconButton'
+import { OptionalSuperEmbeddedImageProps } from './OptionalSuperEmbeddedImageProps'
+import usePreference from '@/Hooks/usePreference'
+import { getCSSValueFromAlignment, ImageAlignmentOptions } from './ImageAlignmentOptions'
+import { ElementIds } from '../../Constants/ElementIDs'
+import { getOverflows } from '@/Components/Popover/Utils/Collisions'
 
 type Props = {
   objectUrl: string
   isEmbeddedInSuper: boolean
-} & ImageZoomLevelProps
+} & OptionalSuperEmbeddedImageProps
 
 const MinimumZoomPercent = 10
 const DefaultZoomPercent = 100
@@ -19,6 +23,8 @@ const ImagePreview: FunctionComponent<Props> = ({
   isEmbeddedInSuper,
   imageZoomLevel,
   setImageZoomLevel,
+  alignment,
+  changeAlignment,
 }) => {
   const [imageWidth, setImageWidth] = useState(0)
   const [imageHeight, setImageHeight] = useState<number>(0)
@@ -48,8 +54,96 @@ const ImagePreview: FunctionComponent<Props> = ({
 
   const widthIfEmbedded = imageWidth * (imageZoomPercent / PercentageDivisor)
 
+  const imageResizer = (
+    <>
+      <span className="mr-1.5">{isEmbeddedInSuper ? 'Size' : 'Zoom'}:</span>
+      <IconButton
+        className="rounded p-1 hover:bg-contrast"
+        icon={'subtract' as IconType}
+        title={isEmbeddedInSuper ? 'Decrease size' : 'Zoom Out'}
+        focusable={true}
+        onClick={(e) => {
+          e.preventDefault()
+          e.stopPropagation()
+          const newPercent = imageZoomPercent - ZoomPercentModifier
+          if (newPercent >= ZoomPercentModifier) {
+            setImageZoom(newPercent)
+          } else {
+            setImageZoom(imageZoomPercent)
+          }
+        }}
+        onMouseDown={(e) => {
+          e.preventDefault()
+        }}
+      />
+      {isZoomInputVisible ? (
+        <div className="mx-2">
+          <input
+            type="number"
+            className="w-10 bg-default text-center"
+            defaultValue={imageZoomPercent}
+            onKeyDown={(event) => {
+              event.stopPropagation()
+              if (event.key === 'Enter') {
+                const value = parseInt(event.currentTarget.value)
+                if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
+                  setImageZoom(value)
+                }
+                setIsZoomInputVisible(false)
+              }
+            }}
+            onBlur={(event) => {
+              setIsZoomInputVisible(false)
+              const value = parseInt(event.currentTarget.value)
+              if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
+                setImageZoom(value)
+              }
+            }}
+          />
+          %
+        </div>
+      ) : (
+        <button
+          className="mx-1 rounded px-1.5 py-1 hover:bg-contrast"
+          onClick={(e) => {
+            e.preventDefault()
+            e.stopPropagation()
+            setIsZoomInputVisible((visible) => !visible)
+          }}
+        >
+          {imageZoomPercent}%
+        </button>
+      )}
+      <IconButton
+        className="rounded p-1 hover:bg-contrast"
+        icon="add"
+        title={isEmbeddedInSuper ? 'Increase size' : 'Zoom In'}
+        focusable={true}
+        onClick={(e) => {
+          e.preventDefault()
+          e.stopPropagation()
+          setImageZoom(imageZoomPercent + ZoomPercentModifier)
+        }}
+        onMouseDown={(e) => {
+          e.preventDefault()
+        }}
+      />
+    </>
+  )
+
+  const defaultSuperImageAlignment = usePreference(PrefKey.SuperNoteImageAlignment)
+  const finalAlignment = alignment || defaultSuperImageAlignment
+  const justifyContent = isEmbeddedInSuper ? getCSSValueFromAlignment(finalAlignment) : 'center'
+
   return (
-    <div className="group relative flex h-full min-h-0 w-full items-center justify-center">
+    <div
+      className="group relative flex h-full min-h-0 w-full items-center"
+      style={{ justifyContent }}
+      onClick={(e) => {
+        e.preventDefault()
+        e.stopPropagation()
+      }}
+    >
       <div
         className="relative flex h-full w-full items-center justify-center overflow-auto"
         style={{
@@ -78,71 +172,37 @@ const ImagePreview: FunctionComponent<Props> = ({
           }}
         />
       </div>
-      <div
-        className={classNames(
-          isEmbeddedInSuper ? 'hidden focus-within:flex group-hover:flex' : '',
-          'absolute bottom-6 left-1/2 flex -translate-x-1/2 items-center rounded border border-solid border-border bg-default px-3 py-1',
-        )}
-      >
-        <span className="mr-1.5">{isEmbeddedInSuper ? 'Size' : 'Zoom'}:</span>
-        <IconButton
-          className="rounded p-1 hover:bg-contrast"
-          icon={'subtract' as IconType}
-          title={isEmbeddedInSuper ? 'Decrease size' : 'Zoom Out'}
-          focusable={true}
-          onClick={() => {
-            const newPercent = imageZoomPercent - ZoomPercentModifier
-            if (newPercent >= ZoomPercentModifier) {
-              setImageZoom(newPercent)
-            } else {
-              setImageZoom(imageZoomPercent)
+      {!isEmbeddedInSuper && (
+        <div className="absolute bottom-6 left-1/2 flex -translate-x-1/2 items-center rounded border border-solid border-border bg-default px-3 py-1">
+          {imageResizer}
+        </div>
+      )}
+      {isEmbeddedInSuper && (
+        <div
+          className="invisible absolute bottom-full left-1/2 z-10 w-max -translate-x-1/2 px-1 pb-1 focus-within:visible group-hover:visible [.embedBlockFocused_&]:visible"
+          ref={(popover) => {
+            const editorRoot = document.getElementById(ElementIds.SuperEditorContent)
+            if (!popover || !editorRoot) {
+              return
+            }
+            const editorRootRect = editorRoot.getBoundingClientRect()
+            const popoverRect = popover.getBoundingClientRect()
+            const overflows = getOverflows(popoverRect, editorRootRect)
+            if (overflows.top > 0) {
+              popover.style.setProperty('--tw-translate-y', `${overflows.top}px`)
             }
           }}
-        />
-        {isZoomInputVisible ? (
-          <div className="mx-2">
-            <input
-              type="number"
-              className="w-10 bg-default text-center"
-              defaultValue={imageZoomPercent}
-              onKeyDown={(event) => {
-                event.stopPropagation()
-                if (event.key === 'Enter') {
-                  const value = parseInt(event.currentTarget.value)
-                  if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
-                    setImageZoom(value)
-                  }
-                  setIsZoomInputVisible(false)
-                }
-              }}
-              onBlur={(event) => {
-                setIsZoomInputVisible(false)
-                const value = parseInt(event.currentTarget.value)
-                if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
-                  setImageZoom(value)
-                }
-              }}
-            />
-            %
+        >
+          <div className="flex divide-x divide-border rounded border border-border bg-default">
+            {changeAlignment && (
+              <div className="flex items-center gap-1 px-1 py-0.5">
+                <ImageAlignmentOptions alignment={finalAlignment} changeAlignment={changeAlignment} />
+              </div>
+            )}
+            <div className="flex items-center px-2 py-0.5 text-sm">{imageResizer}</div>
           </div>
-        ) : (
-          <button
-            className="mx-1 rounded px-1.5 py-1 hover:bg-contrast"
-            onClick={() => setIsZoomInputVisible((visible) => !visible)}
-          >
-            {imageZoomPercent}%
-          </button>
-        )}
-        <IconButton
-          className="rounded p-1 hover:bg-contrast"
-          icon="add"
-          title={isEmbeddedInSuper ? 'Increase size' : 'Zoom In'}
-          focusable={true}
-          onClick={() => {
-            setImageZoom(imageZoomPercent + ZoomPercentModifier)
-          }}
-        />
-      </div>
+        </div>
+      )}
     </div>
   )
 }

packages/web/src/javascripts/Components/FilePreview/ImageZoomLevelProps.tsx

@@ -1,4 +0,0 @@
-export type ImageZoomLevelProps = {
-  imageZoomLevel?: number
-  setImageZoomLevel?: (zoomLevel: number) => void
-}

packages/web/src/javascripts/Components/FilePreview/OptionalSuperEmbeddedImageProps.tsx

@@ -0,0 +1,8 @@
+import { ElementFormatType } from 'lexical'
+
+export type OptionalSuperEmbeddedImageProps = {
+  imageZoomLevel?: number
+  setImageZoomLevel?: (zoomLevel: number) => void
+  alignment?: ElementFormatType | null
+  changeAlignment?: (alignment: ElementFormatType) => void
+}

packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx

@@ -5,7 +5,7 @@ import { FunctionComponent, useCallback, useEffect, useMemo, useRef } from 'reac
 import Button from '../Button/Button'
 import { createObjectURLWithRef } from './CreateObjectURLWithRef'
 import ImagePreview from './ImagePreview'
-import { ImageZoomLevelProps } from './ImageZoomLevelProps'
+import { OptionalSuperEmbeddedImageProps } from './OptionalSuperEmbeddedImageProps'
 import { PreviewableTextFileTypes, RequiresNativeFilePreview } from './isFilePreviewable'
 import TextPreview from './TextPreview'
 import { parseFileName, sanitizeFileName } from '@standardnotes/utils'
@@ -16,7 +16,7 @@ type Props = {
   file: FileItem
   bytes: Uint8Array
   isEmbeddedInSuper: boolean
-} & ImageZoomLevelProps
+} & OptionalSuperEmbeddedImageProps
 
 const PreviewComponent: FunctionComponent<Props> = ({
   application,
@@ -25,6 +25,8 @@ const PreviewComponent: FunctionComponent<Props> = ({
   isEmbeddedInSuper,
   imageZoomLevel,
   setImageZoomLevel,
+  alignment,
+  changeAlignment,
 }) => {
   const objectUrlRef = useRef<string>()
 
@@ -84,6 +86,8 @@ const PreviewComponent: FunctionComponent<Props> = ({
         isEmbeddedInSuper={isEmbeddedInSuper}
         imageZoomLevel={imageZoomLevel}
         setImageZoomLevel={setImageZoomLevel}
+        alignment={alignment}
+        changeAlignment={changeAlignment}
       />
     )
   }

packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx

@@ -109,7 +109,7 @@ const LinkedItemBubble = ({
         ref={(el) => (ref.current = el as HTMLElement)}
         tabIndex={0}
         className={classNames(
-          'group cursor-pointer rounded align-middle [&>*]:align-middle',
+          'group cursor-pointer rounded ',
           'bg-passive-4-opacity-variant outline-1 outline-info hover:bg-contrast focus:bg-contrast focus:outline',
           'whitespace-pre-wrap text-left text-sm text-text hover:no-underline focus:no-underline lg:text-xs',
           'py-1 pl-1 pr-2',
@@ -121,7 +121,7 @@ const LinkedItemBubble = ({
         title={tagTitle ? tagTitle.longTitle : link.item.title}
         onKeyDown={onKeyDown}
       >
-        <Icon type={icon} className={classNames('mr-1 inline', iconClassName)} size="small" />
+        <Icon type={icon} className={classNames('mr-1 inline h-[1.15em] align-text-top', iconClassName)} size="small" />
         {tagTitle && <span className="text-passive-1">{tagTitle.titlePrefix}</span>}
         {link.type === 'linked-by' && link.item.content_type !== ContentType.TYPES.Tag && (
           <span className={!isBidirectional ? 'hidden group-focus:inline' : ''}>Linked By:</span>
@@ -131,7 +131,7 @@ const LinkedItemBubble = ({
           <button
             ref={(el) => (unlinkButtonRef.current = el as HTMLElement)}
             role="button"
-            className="-mr-1 ml-2 inline-flex cursor-pointer border-0 bg-transparent p-0"
+            className="-mr-1 ml-2 inline-flex cursor-pointer border-0 bg-transparent p-0 h-[1.15em] align-middle"
             onClick={onUnlinkClick}
           >
             <Icon type="close" className="text-neutral hover:text-info" size="small" />

packages/web/src/javascripts/Components/NoteView/EditorContentWithSafeAreaPadding.tsx

@@ -6,9 +6,11 @@ import { useAvailableSafeAreaPadding } from '@/Hooks/useSafeAreaPadding'
 
 export const EditorContentWithSafeAreaPadding = forwardRef(function EditorContentWithSafeAreaPadding(
   {
+    isNoteLocked,
     editorLineWidth,
     children,
   }: {
+    isNoteLocked: boolean
     editorLineWidth: EditorLineWidth
     children: NonNullable<ReactNode>
   },
@@ -22,7 +24,7 @@ export const EditorContentWithSafeAreaPadding = forwardRef(function EditorConten
       className={classNames(
         ElementIds.EditorContent,
         'z-editor-content overflow-auto sm:[&>*]:mx-[var(--editor-margin)] sm:[&>*]:max-w-[var(--editor-max-width)]',
-        hasBottomInset && 'pb-safe-bottom',
+        hasBottomInset && isNoteLocked && 'pb-safe-bottom',
       )}
       style={
         {

packages/web/src/javascripts/Components/NoteView/NoteView.tsx

@@ -955,7 +955,11 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
           </div>
         )}
 
-        <EditorContentWithSafeAreaPadding editorLineWidth={this.state.editorLineWidth} ref={this.editorContentRef}>
+        <EditorContentWithSafeAreaPadding
+          isNoteLocked={this.state.noteLocked}
+          editorLineWidth={this.state.editorLineWidth}
+          ref={this.editorContentRef}
+        >
           {editorMode === 'component' && this.state.editorComponentViewer && (
             <div className="component-view relative flex-grow">
               {this.state.paneGestureEnabled && <div className="absolute left-0 top-0 h-full w-[20px] md:hidden" />}

packages/web/src/javascripts/Components/Preferences/Panes/General/Defaults.tsx

@@ -1,12 +1,14 @@
-import { PrefKey, Platform } from '@standardnotes/snjs'
+import { PrefKey, Platform, PrefValue } from '@standardnotes/snjs'
 import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content'
 import { WebApplication } from '@/Application/WebApplication'
-import { FunctionComponent, useState } from 'react'
+import { FunctionComponent, useMemo, useState } from 'react'
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import Switch from '@/Components/Switch/Switch'
 import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
 import usePreference from '@/Hooks/usePreference'
+import Dropdown from '@/Components/Dropdown/Dropdown'
+import { DropdownItem } from '@/Components/Dropdown/DropdownItem'
 import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 
 type Props = {
@@ -27,6 +29,27 @@ const Defaults: FunctionComponent<Props> = ({ application }) => {
   const addNoteToParentFolders = usePreference(PrefKey.NoteAddToParentFolders)
 
   const alwaysShowSuperToolbar = usePreference(PrefKey.AlwaysShowSuperToolbar)
+  const defaultSuperImageAlignment = usePreference(PrefKey.SuperNoteImageAlignment)
+  const imageAlignmentOptions = useMemo(
+    (): DropdownItem[] => [
+      {
+        icon: 'format-align-left',
+        label: 'Left align',
+        value: 'left',
+      },
+      {
+        icon: 'format-align-center',
+        label: 'Center align',
+        value: 'center',
+      },
+      {
+        icon: 'format-align-right',
+        label: 'Right align',
+        value: 'right',
+      },
+    ],
+    [],
+  )
 
   const toggleSpellcheck = () => {
     application.toggleGlobalSpellcheck().catch(console.error)
@@ -79,23 +102,46 @@ const Defaults: FunctionComponent<Props> = ({ application }) => {
         </div>
         <HorizontalSeparator classes="my-4" />
         {!isMobile && (
-          <div className="flex justify-between gap-2 md:items-center">
-            <div className="flex flex-col">
-              <Subtitle>Use always-visible toolbar in Super notes</Subtitle>
-              <Text>
-                When enabled, the Super toolbar will always be shown at the top of the note. It can be temporarily
-                toggled using Cmd/Ctrl+Shift+K. When disabled, the Super toolbar will only be shown as a floating
-                toolbar when text is selected.
-              </Text>
+          <>
+            <div className="flex justify-between gap-2 md:items-center">
+              <div className="flex flex-col">
+                <Subtitle>Use always-visible toolbar in Super notes</Subtitle>
+                <Text>
+                  When enabled, the Super toolbar will always be shown at the top of the note. It can be temporarily
+                  toggled using Cmd/Ctrl+Shift+K. When disabled, the Super toolbar will only be shown as a floating
+                  toolbar when text is selected.
+                </Text>
+              </div>
+              <Switch
+                onChange={() => {
+                  application
+                    .setPreference(PrefKey.AlwaysShowSuperToolbar, !alwaysShowSuperToolbar)
+                    .catch(console.error)
+                }}
+                checked={alwaysShowSuperToolbar}
+              />
             </div>
-            <Switch
-              onChange={() => {
-                application.setPreference(PrefKey.AlwaysShowSuperToolbar, !alwaysShowSuperToolbar).catch(console.error)
+            <HorizontalSeparator classes="my-4" />
+          </>
+        )}
+        <div>
+          <Subtitle>Default image alignment in Super notes</Subtitle>
+          <div className="mt-2">
+            <Dropdown
+              label="Default image alignment in super notes"
+              items={imageAlignmentOptions}
+              value={defaultSuperImageAlignment}
+              onChange={(alignment) => {
+                application
+                  .setPreference(
+                    PrefKey.SuperNoteImageAlignment,
+                    alignment as PrefValue[PrefKey.SuperNoteImageAlignment],
+                  )
+                  .catch(console.error)
               }}
-              checked={alwaysShowSuperToolbar}
             />
           </div>
-        )}
+        </div>
       </PreferencesSegment>
     </PreferencesGroup>
   )

packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/Theme.ts

@@ -38,7 +38,7 @@ const BlocksEditorTheme: EditorThemeClasses = {
   },
   embedBlock: {
     base: 'Lexical__embedBlock',
-    focus: 'Lexical__embedBlockFocus',
+    focus: 'embedBlockFocused',
   },
   hashtag: 'Lexical__hashtag',
   heading: {

packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss

@@ -253,7 +253,7 @@
 .Lexical__embedBlock {
   user-select: none;
 }
-.Lexical__embedBlockFocus {
+.embedBlockFocused {
   outline: 2px solid var(--sn-stylekit-info-color);
 }
 

packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx

@@ -1,6 +1,13 @@
 import { BlockWithAlignableContents } from '@lexical/react/LexicalBlockWithAlignableContents'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { $getNodeByKey, CLICK_COMMAND, COMMAND_PRIORITY_LOW, ElementFormatType, NodeKey } from 'lexical'
+import {
+  $getNodeByKey,
+  CLICK_COMMAND,
+  COMMAND_PRIORITY_LOW,
+  ElementFormatType,
+  NodeKey,
+  SKIP_DOM_SELECTION_TAG,
+} from 'lexical'
 import { useApplication } from '@/Components/ApplicationProvider'
 import FilePreview from '@/Components/FilePreview/FilePreview'
 import { FileItem } from '@standardnotes/snjs'
@@ -16,13 +23,22 @@ export type FileComponentProps = Readonly<{
     focus: string
   }>
   format: ElementFormatType | null
+  setFormat: (format: ElementFormatType) => void
   nodeKey: NodeKey
   fileUuid: string
   zoomLevel: number
   setZoomLevel: (zoomLevel: number) => void
 }>
 
-function FileComponent({ className, format, nodeKey, fileUuid, zoomLevel, setZoomLevel }: FileComponentProps) {
+function FileComponent({
+  className,
+  format,
+  setFormat,
+  nodeKey,
+  fileUuid,
+  zoomLevel,
+  setZoomLevel,
+}: FileComponentProps) {
   const application = useApplication()
   const [editor] = useLexicalComposerContext()
   const [file, setFile] = useState(() => application.items.findItem<FileItem>(fileUuid))
@@ -71,6 +87,19 @@ function FileComponent({ className, format, nodeKey, fileUuid, zoomLevel, setZoo
     [editor, setZoomLevel],
   )
 
+  const changeAlignment = useCallback(
+    (alignment: ElementFormatType) =>
+      editor.update(
+        () => {
+          setFormat(alignment)
+        },
+        {
+          tag: SKIP_DOM_SELECTION_TAG,
+        },
+      ),
+    [editor, setFormat],
+  )
+
   const [isSelected, setSelected] = useLexicalNodeSelection(nodeKey)
 
   useEffect(() => {
@@ -147,6 +176,8 @@ function FileComponent({ className, format, nodeKey, fileUuid, zoomLevel, setZoo
             application={application}
             imageZoomLevel={zoomLevel}
             setImageZoomLevel={setImageZoomLevel}
+            alignment={format}
+            changeAlignment={changeAlignment}
           />
         )}
       </div>

packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode.tsx

@@ -94,6 +94,7 @@ export class FileNode extends DecoratorBlockNode implements ItemNodeInterface {
       <FileComponent
         className={className}
         format={this.__format}
+        setFormat={this.setFormat.bind(this)}
         nodeKey={this.getKey()}
         fileUuid={this.__id}
         zoomLevel={this.__zoomLevel}

packages/web/src/javascripts/Components/SuperEditor/Plugins/InlineFilePlugin/InlineFileComponent.tsx

@@ -1,5 +1,5 @@
 import { BlockWithAlignableContents } from '@lexical/react/LexicalBlockWithAlignableContents'
-import { Platform, classNames } from '@standardnotes/snjs'
+import { Platform, PrefKey, classNames } from '@standardnotes/snjs'
 import { ElementFormatType, NodeKey } from 'lexical'
 import { InlineFileNode } from './InlineFileNode'
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
@@ -9,6 +9,9 @@ import { $createFileNode } from '../EncryptedFilePlugin/Nodes/FileUtils'
 import { isIOS } from '@standardnotes/ui-services'
 import Icon from '@/Components/Icon/Icon'
 import Spinner from '@/Components/Spinner/Spinner'
+import usePreference from '@/Hooks/usePreference'
+import { getCSSValueFromAlignment, ImageAlignmentOptions } from '@/Components/FilePreview/ImageAlignmentOptions'
+import { getOverflows } from '@/Components/Popover/Utils/Collisions'
 
 type Props = {
   fileName: string | undefined
@@ -19,11 +22,12 @@ type Props = {
     focus: string
   }>
   format: ElementFormatType | null
+  setFormat: (format: ElementFormatType) => void
   node: InlineFileNode
   nodeKey: NodeKey
 }
 
-const InlineFileComponent = ({ className, src, mimeType, fileName, format, node, nodeKey }: Props) => {
+const InlineFileComponent = ({ className, src, mimeType, fileName, format, setFormat, node, nodeKey }: Props) => {
   const application = useApplication()
   const [editor] = useLexicalComposerContext()
 
@@ -57,11 +61,49 @@ const InlineFileComponent = ({ className, src, mimeType, fileName, format, node,
 
   const isPDF = mimeType === 'application/pdf'
 
+  const defaultSuperImageAlignment = usePreference(PrefKey.SuperNoteImageAlignment)
+  const finalAlignment = format || defaultSuperImageAlignment
+  const alignItems: 'start' | 'center' | 'end' = getCSSValueFromAlignment(finalAlignment)
+  const changeAlignment = useCallback(
+    (format: ElementFormatType) => {
+      editor.update(() => {
+        setFormat(format)
+      })
+    },
+    [editor, setFormat],
+  )
+
   return (
     <BlockWithAlignableContents className={className} format={format} nodeKey={nodeKey}>
       {mimeType.startsWith('image') ? (
-        <div className="relative flex min-h-[2rem] flex-col items-center gap-2.5">
+        <div
+          className="group relative flex min-h-[2rem] flex-col gap-2.5"
+          style={{ alignItems }}
+          onClick={(e) => {
+            e.preventDefault()
+            e.stopPropagation()
+          }}
+        >
           <img alt={fileName} src={src} />
+          <div
+            className="invisible absolute bottom-full left-1/2 z-10 w-max -translate-x-1/2 px-1 pb-1 focus-within:visible group-hover:visible [.embedBlockFocused_&]:visible"
+            ref={(popover) => {
+              const editorRoot = editor.getRootElement()
+              if (!popover || !editorRoot) {
+                return
+              }
+              const editorRootRect = editorRoot.getBoundingClientRect()
+              const popoverRect = popover.getBoundingClientRect()
+              const overflows = getOverflows(popoverRect, editorRootRect)
+              if (overflows.top > 0) {
+                popover.style.setProperty('--tw-translate-y', `${overflows.top}px`)
+              }
+            }}
+          >
+            <div className="flex gap-1 rounded border border-border bg-default px-1 py-0.5">
+              <ImageAlignmentOptions alignment={finalAlignment} changeAlignment={changeAlignment} />
+            </div>
+          </div>
         </div>
       ) : mimeType.startsWith('video') ? (
         <video className="h-full w-full" controls autoPlay>

packages/web/src/javascripts/Components/SuperEditor/Plugins/InlineFilePlugin/InlineFileNode.tsx

@@ -172,6 +172,7 @@ export class InlineFileNode extends DecoratorBlockNode {
       <InlineFileComponent
         className={className}
         format={this.__format}
+        setFormat={this.setFormat.bind(this)}
         node={this}
         nodeKey={this.getKey()}
         src={this.__src}

packages/web/src/javascripts/Components/SuperEditor/Plugins/RemoteImagePlugin/RemoteImageComponent.tsx

@@ -4,13 +4,16 @@ import Spinner from '@/Components/Spinner/Spinner'
 import { isDesktopApplication } from '@/Utils'
 import { BlockWithAlignableContents } from '@lexical/react/LexicalBlockWithAlignableContents'
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
-import { classNames, Platform } from '@standardnotes/snjs'
+import { classNames, Platform, PrefKey } from '@standardnotes/snjs'
 import { $getNodeByKey, CLICK_COMMAND, COMMAND_PRIORITY_LOW, ElementFormatType, NodeKey } from 'lexical'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { $createFileNode } from '../EncryptedFilePlugin/Nodes/FileUtils'
 import { RemoteImageNode } from './RemoteImageNode'
 import { isIOS } from '@standardnotes/ui-services'
 import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection'
+import usePreference from '@/Hooks/usePreference'
+import { getCSSValueFromAlignment, ImageAlignmentOptions } from '@/Components/FilePreview/ImageAlignmentOptions'
+import { getOverflows } from '@/Components/Popover/Utils/Collisions'
 
 type Props = {
   src: string
@@ -21,10 +24,11 @@ type Props = {
     focus: string
   }>
   format: ElementFormatType | null
+  setFormat: (format: ElementFormatType) => void
   nodeKey: NodeKey
 }
 
-const RemoteImageComponent = ({ className, src, alt, node, format, nodeKey }: Props) => {
+const RemoteImageComponent = ({ className, src, alt, node, format, nodeKey, setFormat }: Props) => {
   const application = useApplication()
   const [editor] = useLexicalComposerContext()
 
@@ -91,9 +95,30 @@ const RemoteImageComponent = ({ className, src, alt, node, format, nodeKey }: Pr
     )
   }, [editor, isSelected, nodeKey, setSelected])
 
+  const changeAlignment = useCallback(
+    (format: ElementFormatType) => {
+      editor.update(() => {
+        setFormat(format)
+      })
+    },
+    [editor, setFormat],
+  )
+
+  const defaultSuperImageAlignment = usePreference(PrefKey.SuperNoteImageAlignment)
+  const finalAlignment = format || defaultSuperImageAlignment
+  const alignItems: 'start' | 'center' | 'end' = getCSSValueFromAlignment(finalAlignment)
+
   return (
     <BlockWithAlignableContents className={className} format={format} nodeKey={nodeKey}>
-      <div ref={ref} className="relative flex min-h-[2rem] flex-col items-center gap-2.5">
+      <div
+        ref={ref}
+        className="group relative flex min-h-[2rem] flex-col gap-2.5"
+        style={{ alignItems }}
+        onClick={(e) => {
+          e.preventDefault()
+          e.stopPropagation()
+        }}
+      >
         <img
           alt={alt}
           src={src}
@@ -101,6 +126,25 @@ const RemoteImageComponent = ({ className, src, alt, node, format, nodeKey }: Pr
             setDidImageLoad(true)
           }}
         />
+        <div
+          className="invisible absolute bottom-full left-1/2 z-10 w-max -translate-x-1/2 px-1 pb-1 focus-within:visible group-hover:visible [.embedBlockFocused_&]:visible"
+          ref={(popover) => {
+            const editorRoot = editor.getRootElement()
+            if (!popover || !editorRoot) {
+              return
+            }
+            const editorRootRect = editorRoot.getBoundingClientRect()
+            const popoverRect = popover.getBoundingClientRect()
+            const overflows = getOverflows(popoverRect, editorRootRect)
+            if (overflows.top > 0) {
+              popover.style.setProperty('--tw-translate-y', `${overflows.top}px`)
+            }
+          }}
+        >
+          <div className="flex gap-1 rounded border border-border bg-default px-1 py-0.5">
+            <ImageAlignmentOptions alignment={finalAlignment} changeAlignment={changeAlignment} />
+          </div>
+        </div>
         {didImageLoad && canShowSaveButton && (
           <button
             className={classNames(

packages/web/src/javascripts/Components/SuperEditor/Plugins/RemoteImagePlugin/RemoteImageNode.tsx

@@ -94,6 +94,7 @@ export class RemoteImageNode extends DecoratorBlockNode {
       <RemoteImageComponent
         className={className}
         format={this.__format}
+        setFormat={this.setFormat.bind(this)}
         nodeKey={this.getKey()}
         node={this}
         src={this.__src}