Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: editor ui overhaul

Ammar Ahmed4c97b3481d0d
diff --git a/apps/mobile/app/components/properties/index.js b/apps/mobile/app/components/properties/index.js
index 56acc0325..211b063e7 100644
--- a/apps/mobile/app/components/properties/index.js
+++ b/apps/mobile/app/components/properties/index.js
@@ -21,13 +21,14 @@ import { useThemeColors } from "@notesnook/theme";
import React from "react";
import { View } from "react-native";
import { FlatList } from "react-native-actions-sheet";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
import { db } from "../../common/database";
import { DDS } from "../../services/device-detection";
import { eSendEvent, presentSheet } from "../../services/event-manager";
-import { ColorValues } from "../../utils/colors";
import { eOnLoadNote } from "../../utils/events";
import { fluidTabsRef } from "../../utils/global-refs";
import { AppFontSize } from "../../utils/size";
+import { DefaultAppStyles } from "../../utils/styles";
import SheetProvider from "../sheet-provider";
import { IconButton } from "../ui/icon-button";
import { Pressable } from "../ui/pressable";
@@ -38,8 +39,6 @@ import { DateMeta } from "./date-meta";
import { Items } from "./items";
import Notebooks from "./notebooks";
import { TagStrip, Tags } from "./tags";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { DefaultAppStyles } from "../../utils/styles";
const Line = ({ top = 6, bottom = 6 }) => {
const { colors } = useThemeColors();
diff --git a/apps/mobile/app/components/properties/tags.js b/apps/mobile/app/components/properties/tags.js
index 2d8ed73b7..830b2d10a 100644
--- a/apps/mobile/app/components/properties/tags.js
+++ b/apps/mobile/app/components/properties/tags.js
@@ -29,6 +29,10 @@ import { ColorTags } from "./color-tags";
import { strings } from "@notesnook/intl";
import { DefaultAppStyles } from "../../utils/styles";
import ManageTags from "../../screens/manage-tags";
+import {
+ paddingTop,
+ paddingVertical
+} from "deprecated-react-native-prop-types/DeprecatedLayoutPropTypes";
export const Tags = ({ item, close }) => {
const { colors } = useThemeColors();
@@ -86,7 +90,6 @@ export const TagStrip = ({ item, close }) => {
flexDirection: "row",
flexWrap: "wrap",
alignItems: "center",
- marginTop: DefaultAppStyles.GAP_VERTICAL,
gap: 5
}}
>
@@ -107,16 +110,13 @@ const TagItem = ({ tag, close }) => {
const style = {
paddingHorizontal: 0,
- borderRadius: 100,
- marginTop: 0,
- backgroundColor: "transparent"
+ paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
};
return (
<Button
onPress={onPress}
title={"#" + tag.title}
type="plain"
- height={20}
fontSize={AppFontSize.xs}
style={style}
textStyle={{
diff --git a/apps/mobile/app/utils/size/index.js b/apps/mobile/app/utils/size/index.js
index 2efc6819e..f4cb1594a 100644
--- a/apps/mobile/app/utils/size/index.js
+++ b/apps/mobile/app/utils/size/index.js
@@ -89,10 +89,10 @@ function getSize() {
xs: normalize(13.5) * scale.fontScale,
sm: normalize(14.5) * scale.fontScale,
md: normalize(16.5) * scale.fontScale,
- lg: normalize(22) * scale.fontScale,
- xl: normalize(24) * scale.fontScale,
- xxl: normalize(28) * scale.fontScale,
- xxxl: normalize(32) * scale.fontScale
+ lg: normalize(20) * scale.fontScale,
+ xl: normalize(22) * scale.fontScale,
+ xxl: normalize(25) * scale.fontScale,
+ xxxl: normalize(30) * scale.fontScale
};
}
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index cdaf53230..a9f9803a1 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -14,7 +14,6 @@
"app/"
],
"dependencies": {
- "@ammarahmed/react-native-sodium": "^1.6.5",
"@notesnook/common": "file:../../packages/common",
"@notesnook/core": "file:../../packages/core",
"@notesnook/crypto": "file:../../packages/crypto",
@@ -7747,7 +7746,7 @@
},
"../../packages/editor-mobile/node_modules/@types/prop-types": {
"version": "15.7.11",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"../../packages/editor-mobile/node_modules/@types/q": {
@@ -7767,7 +7766,7 @@
},
"../../packages/editor-mobile/node_modules/@types/react": {
"version": "18.2.39",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@types/prop-types": "*",
@@ -7798,7 +7797,7 @@
},
"../../packages/editor-mobile/node_modules/@types/scheduler": {
"version": "0.16.8",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"../../packages/editor-mobile/node_modules/@types/semver": {
@@ -12623,7 +12622,7 @@
},
"../../packages/editor-mobile/node_modules/immer": {
"version": "9.0.21",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"funding": {
"type": "opencollective",
@@ -23095,6 +23094,7 @@
},
"../../packages/editor/node_modules/js-tokens": {
"version": "4.0.0",
+ "dev": true,
"license": "MIT"
},
"../../packages/editor/node_modules/jsesc": {
@@ -23145,6 +23145,7 @@
},
"../../packages/editor/node_modules/loose-envify": {
"version": "1.4.0",
+ "dev": true,
"license": "MIT",
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
@@ -23656,6 +23657,7 @@
},
"../../packages/editor/node_modules/react": {
"version": "18.3.1",
+ "dev": true,
"license": "MIT",
"dependencies": {
"loose-envify": "^1.1.0"
@@ -23674,6 +23676,7 @@
},
"../../packages/editor/node_modules/react-dom": {
"version": "18.3.1",
+ "dev": true,
"license": "MIT",
"dependencies": {
"loose-envify": "^1.1.0",
@@ -23812,6 +23815,7 @@
},
"../../packages/editor/node_modules/scheduler": {
"version": "0.23.2",
+ "dev": true,
"license": "MIT",
"dependencies": {
"loose-envify": "^1.1.0"
@@ -28320,6 +28324,7 @@
"@ammarahmed/react-native-eventsource": "1.1.0",
"@ammarahmed/react-native-fingerprint-scanner": "^5.0.0",
"@ammarahmed/react-native-share-extension": "^2.9.0",
+ "@ammarahmed/react-native-sodium": "^1.6.5",
"@bam.tech/react-native-image-resizer": "3.0.11",
"@callstack/repack": "~5.1.2",
"@formatjs/intl-locale": "4.0.0",
@@ -28902,6 +28907,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
"integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
@@ -28918,6 +28924,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
"integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -28933,6 +28940,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
"integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -28948,6 +28956,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
"integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
@@ -28965,6 +28974,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
"integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
@@ -29107,6 +29117,7 @@
"version": "7.21.0-placeholder-for-preset-env.2",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+ "dev": true,
"engines": {
"node": ">=6.9.0"
},
@@ -29188,6 +29199,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
"integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29203,6 +29215,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
"integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29345,6 +29358,7 @@
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+ "dev": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6"
@@ -29409,6 +29423,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
"integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29455,6 +29470,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
"integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.27.1",
@@ -29522,6 +29538,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
"integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -29538,6 +29555,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
"integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29553,6 +29571,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
"integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -29569,6 +29588,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
"integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29584,6 +29604,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
"integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29599,6 +29620,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
"integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29663,6 +29685,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
"integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29708,6 +29731,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
"integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29723,6 +29747,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
"integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-transforms": "^7.27.1",
@@ -29755,6 +29780,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
"integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-transforms": "^7.27.1",
@@ -29773,6 +29799,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
"integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-transforms": "^7.27.1",
@@ -29805,6 +29832,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
"integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -29868,6 +29896,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
"integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1",
@@ -29963,6 +29992,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
"integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -30057,6 +30087,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
"integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -30073,6 +30104,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
"integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -30178,6 +30210,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
"integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -30212,6 +30245,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
"integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.27.1"
@@ -30227,6 +30261,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
"integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -30259,6 +30294,7 @@
"version": "7.27.1",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
"integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -30275,6 +30311,7 @@
"version": "7.27.2",
"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.27.2.tgz",
"integrity": "sha512-Ma4zSuYSlGNRlCLO+EAzLnCmJK2vdstgv+n7aUP+/IKZrOfWHOJVdSJtuub8RzHTj3ahD37k5OKJWvzf16TQyQ==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/compat-data": "^7.27.2",
@@ -30358,6 +30395,7 @@
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
"bin": {
"semver": "bin/semver.js"
}
@@ -30383,6 +30421,7 @@
"version": "0.1.6-no-external-plugins",
"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
@@ -31297,12 +31336,12 @@
},
"node_modules/@hapi/hoek": {
"version": "9.3.0",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@hapi/topo": {
"version": "5.1.0",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/hoek": "^9.0.0"
@@ -32556,14 +32595,14 @@
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/error-codes/-/error-codes-0.14.3.tgz",
"integrity": "sha512-sBJ3XKU9g5Up31jFeXPFsD8AgORV7TLO/cCSMuRewSfgYbG/3vSKLJmfHrO6+PvjZSb9VyV2UaF02ojktW65vw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/@module-federation/runtime": {
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/runtime/-/runtime-0.14.3.tgz",
"integrity": "sha512-7ZHpa3teUDVhraYdxQGkfGHzPbjna4LtwbpudgzAxSLLFxLDNanaxCuSeIgSM9c+8sVUNC9kvzUgJEZB0krPJw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@module-federation/error-codes": "0.14.3",
@@ -32575,7 +32614,7 @@
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/runtime-core/-/runtime-core-0.14.3.tgz",
"integrity": "sha512-xMFQXflLVW/AJTWb4soAFP+LB4XuhE7ryiLIX8oTyUoBBgV6U2OPghnFljPjeXbud72O08NYlQ1qsHw1kN/V8Q==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@module-federation/error-codes": "0.14.3",
@@ -32586,7 +32625,7 @@
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-0.14.3.tgz",
"integrity": "sha512-QBETX7iMYXdSa3JtqFlYU+YkpymxETZqyIIRiqg0gW+XGpH3jgU68yjrme2NBJp7URQi/CFZG8KWtfClk0Pjgw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@module-federation/runtime": "0.14.3",
@@ -32597,14 +32636,14 @@
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/sdk/-/sdk-0.14.3.tgz",
"integrity": "sha512-THJZMfbXpqjQOLblCQ8jjcBFFXsGRJwUWE9l/Q4SmuCSKMgAwie7yLT0qSGrHmyBYrsUjAuy+xNB4nfKP0pnGw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/@module-federation/webpack-bundler-runtime": {
"version": "0.14.3",
"resolved": "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.14.3.tgz",
"integrity": "sha512-hIyJFu34P7bY2NeMIUHAS/mYUHEY71VTAsN0A0AqEJFSVPszheopu9VdXq0VDLrP9KQfuXT8SDxeYeJXyj0mgA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@module-federation/runtime": "0.14.3",
@@ -32621,7 +32660,7 @@
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@nodelib/fs.stat": "2.0.5",
@@ -32633,7 +32672,7 @@
},
"node_modules/@nodelib/fs.stat": {
"version": "2.0.5",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">= 8"
@@ -32641,7 +32680,7 @@
},
"node_modules/@nodelib/fs.walk": {
"version": "1.2.8",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@nodelib/fs.scandir": "2.1.5",
@@ -32786,7 +32825,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-15.0.1.tgz",
"integrity": "sha512-xIGPytx2bj5HxFk0c7S25AVuJowHmEFg5LFC9XosKc0TSOjP1r6zGC6OqC/arQV/pNuqmZN2IFnpgJn0Bn+hhQ==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-clean": "15.0.1",
@@ -32817,7 +32856,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-15.0.1.tgz",
"integrity": "sha512-flGTfT005UZvW2LAXVowZ/7ri22oiiZE4pPgMvc8klRxO5uofKIRuohgiHybHtiCo/HNqIz45JmZJvuFrhc4Ow==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-tools": "15.0.1",
@@ -32830,7 +32869,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-15.0.1.tgz",
"integrity": "sha512-SL3/9zIyzQQPKWei0+W1gNHxCPurrxqpODUWnVLoP38DNcvYCGtsRayw/4DsXgprZfBC+FsscNpd3IDJrG59XA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-tools": "15.0.1",
@@ -32845,7 +32884,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-config-apple/-/cli-config-apple-15.0.1.tgz",
"integrity": "sha512-GEHUx4NRp9W9or6vygn0TgNeFkcJdNjrtko0vQEJAS4gJdWqP/9LqqwJNlUfaW5jHBN7TKALAMlfRmI12Op3sg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-tools": "15.0.1",
@@ -32858,14 +32897,14 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "devOptional": true,
+ "dev": true,
"license": "Python-2.0"
},
"node_modules/@react-native-community/cli-config/node_modules/cosmiconfig": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"env-paths": "^2.2.1",
@@ -32892,7 +32931,7 @@
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
"integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"parent-module": "^1.0.0",
@@ -32909,7 +32948,7 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"argparse": "^2.0.1"
@@ -32922,7 +32961,7 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.0.0",
@@ -32941,7 +32980,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=4"
@@ -32951,7 +32990,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-15.0.1.tgz",
"integrity": "sha512-xkT2TLS8zg5r7Vl9l/2f7JVUoFECnVBS+B5ivrSu2PNZhKkr9lRmJFxC9aVLFb5lIxQQKNDvEyiIDNfP7wjJiA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"serve-static": "^1.13.1"
@@ -32961,7 +33000,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-15.0.1.tgz",
"integrity": "sha512-YCu44lZR3zZxJJYVTqYZFz9cT9KBfbKI4q2MnKOvkamt00XY3usooMqfuwBAdvM/yvpx7M5w8kbM/nPyj4YCvQ==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-config": "15.0.1",
@@ -32986,7 +33025,7 @@
"version": "7.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -32999,7 +33038,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-15.0.1.tgz",
"integrity": "sha512-QlAMomj6H6TY6pHwjTYMsHDQLP5eLzjAmyW1qb03w/kyS/72elK2bjsklNWJrscFY9TMQLqw7qoAsXf1m5t/dg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-tools": "15.0.1",
@@ -33014,7 +33053,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-apple/-/cli-platform-apple-15.0.1.tgz",
"integrity": "sha512-iQj1Dt2fr/Q7X2CQhyhWnece3eLDCark1osfiwpViksOfTH2WdpNS3lIwlFcIKhsieFU7YYwbNuFqQ3tF9Dlvw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-config-apple": "15.0.1",
@@ -33028,7 +33067,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-15.0.1.tgz",
"integrity": "sha512-6pKzXEIgGL20eE1uOn8iSsNBlMzO1LG+pQOk+7mvD172EPhKm/lRzUVDX5gO/2jvsGoNw6VUW0JX1FI2firwqA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-platform-apple": "15.0.1"
@@ -33038,7 +33077,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-15.0.1.tgz",
"integrity": "sha512-f3rb3t1ELLaMSX5/LWO/IykglBIgiP3+pPnyl8GphHnBpf3bdIcp7fHlHLemvHE06YxT2nANRxRPjy1gNskenA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@react-native-community/cli-debugger-ui": "15.0.1",
@@ -33056,7 +33095,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-15.0.1.tgz",
"integrity": "sha512-N79A+u/94roanfmNohVcNGu6Xg+0idh63JHZFLC9OJJuZwTifGMLDfSTHZATpR1J7rebozQ5ClcSUePavErnSg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"appdirsjs": "^1.2.4",
@@ -33074,7 +33113,7 @@
},
"node_modules/@react-native-community/cli-tools/node_modules/is-wsl": {
"version": "1.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=4"
@@ -33082,7 +33121,7 @@
},
"node_modules/@react-native-community/cli-tools/node_modules/open": {
"version": "6.4.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"is-wsl": "^1.1.0"
@@ -33093,7 +33132,7 @@
},
"node_modules/@react-native-community/cli-tools/node_modules/semver": {
"version": "7.6.3",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -33106,7 +33145,7 @@
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-15.0.1.tgz",
"integrity": "sha512-sWiJ62kkGu2mgYni2dsPxOMBzpwTjNsDH1ubY4mqcNEI9Zmzs0vRwwDUEhYqwNGys9+KpBKoZRrT2PAlhO84xA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"joi": "^17.2.1"
@@ -33114,7 +33153,7 @@
},
"node_modules/@react-native-community/cli/node_modules/fs-extra": {
"version": "8.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"graceful-fs": "^4.2.0",
@@ -33127,7 +33166,7 @@
},
"node_modules/@react-native-community/cli/node_modules/jsonfile": {
"version": "4.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"optionalDependencies": {
"graceful-fs": "^4.1.6"
@@ -33135,7 +33174,7 @@
},
"node_modules/@react-native-community/cli/node_modules/semver": {
"version": "7.6.3",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -33146,7 +33185,7 @@
},
"node_modules/@react-native-community/cli/node_modules/universalify": {
"version": "0.1.2",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">= 4.0.0"
@@ -34046,7 +34085,7 @@
"version": "1.3.15",
"resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-1.3.15.tgz",
"integrity": "sha512-utNPuJglLO5lW9XbwIqjB7+2ilMo6JkuVLTVdnNVKU94FW7asn9F/qV+d+MgjUVqU1QPCGm0NuGO9xhbgeJ7pg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"optionalDependencies": {
"@rspack/binding-darwin-arm64": "1.3.15",
@@ -34067,6 +34106,7 @@
"cpu": [
"arm64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34080,6 +34120,7 @@
"cpu": [
"x64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34093,6 +34134,7 @@
"cpu": [
"arm64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34106,6 +34148,7 @@
"cpu": [
"arm64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34119,6 +34162,7 @@
"cpu": [
"x64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34132,6 +34176,7 @@
"cpu": [
"x64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34145,6 +34190,7 @@
"cpu": [
"arm64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34158,6 +34204,7 @@
"cpu": [
"ia32"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34171,6 +34218,7 @@
"cpu": [
"x64"
],
+ "dev": true,
"license": "MIT",
"optional": true,
"os": [
@@ -34181,7 +34229,7 @@
"version": "1.3.15",
"resolved": "https://registry.npmjs.org/@rspack/core/-/core-1.3.15.tgz",
"integrity": "sha512-QuElIC8jXSKWAp0LSx18pmbhA7NiA5HGoVYesmai90UVxz98tud0KpMxTVCg+0lrLrnKZfCWN9kwjCxM5pGnrA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@module-federation/runtime-tools": "0.14.3",
@@ -34204,7 +34252,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rspack/lite-tapable/-/lite-tapable-1.0.1.tgz",
"integrity": "sha512-VynGOEsVw2s8TAlLf/uESfrgfrq2+rcXB1muPJYBWbsm1Oa6r5qVQhjA5ggM6z/coYPrsVMgovl3Ff7Q7OCp1w==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=16.0.0"
@@ -34285,7 +34333,7 @@
},
"node_modules/@sideway/address": {
"version": "4.1.4",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/hoek": "^9.0.0"
@@ -34293,12 +34341,12 @@
},
"node_modules/@sideway/formula": {
"version": "3.0.1",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@sideway/pinpoint": {
"version": "2.0.0",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@sinclair/typebox": {
@@ -34347,7 +34395,7 @@
"version": "0.5.15",
"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
"integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
- "devOptional": true,
+ "dev": true,
"license": "Apache-2.0",
"dependencies": {
"tslib": "^2.8.0"
@@ -34585,14 +34633,14 @@
},
"node_modules/@types/prop-types": {
"version": "15.7.5",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/@types/react": {
"version": "18.3.18",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
"integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@types/prop-types": "*",
@@ -35099,7 +35147,7 @@
},
"node_modules/ansi-fragments": {
"version": "0.2.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"colorette": "^1.0.7",
@@ -35170,7 +35218,7 @@
},
"node_modules/appdirsjs": {
"version": "1.2.7",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/argparse": {
@@ -35342,7 +35390,7 @@
},
"node_modules/astral-regex": {
"version": "1.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=4"
@@ -35632,7 +35680,7 @@
},
"node_modules/bl": {
"version": "4.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"buffer": "^5.5.0",
@@ -35642,7 +35690,7 @@
},
"node_modules/bl/node_modules/buffer": {
"version": "5.7.1",
- "devOptional": true,
+ "dev": true,
"funding": [
{
"type": "github",
@@ -35875,7 +35923,7 @@
},
"node_modules/bytes": {
"version": "3.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.8"
@@ -36131,7 +36179,7 @@
},
"node_modules/cli-cursor": {
"version": "3.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"restore-cursor": "^3.1.0"
@@ -36142,7 +36190,7 @@
},
"node_modules/cli-spinners": {
"version": "2.9.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=6"
@@ -36238,7 +36286,7 @@
},
"node_modules/clone": {
"version": "1.0.4",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=0.8"
@@ -36294,19 +36342,19 @@
},
"node_modules/colorette": {
"version": "1.4.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/command-exists": {
"version": "1.2.9",
"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/commander": {
"version": "9.5.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": "^12.20.0 || >=14"
@@ -36326,7 +36374,7 @@
},
"node_modules/compressible": {
"version": "2.0.18",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"mime-db": ">= 1.43.0 < 2"
@@ -36337,7 +36385,7 @@
},
"node_modules/compression": {
"version": "1.7.4",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"accepts": "~1.3.5",
@@ -36354,7 +36402,7 @@
},
"node_modules/compression/node_modules/debug": {
"version": "2.6.9",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ms": "2.0.0"
@@ -36362,7 +36410,7 @@
},
"node_modules/compression/node_modules/ms": {
"version": "2.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/concat-map": {
@@ -36522,7 +36570,7 @@
},
"node_modules/csstype": {
"version": "3.1.2",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/data-view-buffer": {
@@ -36670,7 +36718,7 @@
},
"node_modules/defaults": {
"version": "1.0.4",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"clone": "^1.0.2"
@@ -37242,7 +37290,7 @@
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=6"
@@ -37252,7 +37300,7 @@
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"bin": {
"envinfo": "dist/cli.js"
@@ -37277,7 +37325,7 @@
},
"node_modules/errorhandler": {
"version": "1.5.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"accepts": "~1.3.7",
@@ -37878,6 +37926,7 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -38019,7 +38068,7 @@
},
"node_modules/fast-glob": {
"version": "3.3.2",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
@@ -38034,7 +38083,7 @@
},
"node_modules/fast-glob/node_modules/glob-parent": {
"version": "5.1.2",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"dependencies": {
"is-glob": "^4.0.1"
@@ -38110,7 +38159,7 @@
},
"node_modules/fast-xml-parser": {
"version": "4.4.1",
- "devOptional": true,
+ "dev": true,
"funding": [
{
"type": "github",
@@ -38459,7 +38508,7 @@
},
"node_modules/find-up": {
"version": "5.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"locate-path": "^6.0.0",
@@ -38474,7 +38523,7 @@
},
"node_modules/find-up/node_modules/path-exists": {
"version": "4.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
@@ -39586,7 +39635,7 @@
},
"node_modules/is-fullwidth-code-point": {
"version": "2.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=4"
@@ -39671,7 +39720,7 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
"integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
- "devOptional": true,
+ "dev": true,
"engines": {
"node": ">=8"
}
@@ -39859,7 +39908,7 @@
},
"node_modules/is-unicode-supported": {
"version": "0.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
@@ -41096,7 +41145,7 @@
},
"node_modules/joi": {
"version": "17.9.2",
- "devOptional": true,
+ "dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/hoek": "^9.0.0",
@@ -41266,7 +41315,7 @@
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
- "devOptional": true
+ "dev": true
},
"node_modules/json-schema-ref-resolver": {
"version": "1.0.1",
@@ -41425,7 +41474,7 @@
},
"node_modules/kleur": {
"version": "3.0.3",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=6"
@@ -41501,7 +41550,7 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
- "devOptional": true
+ "dev": true
},
"node_modules/listr": {
"version": "0.14.3",
@@ -41766,7 +41815,7 @@
},
"node_modules/locate-path": {
"version": "6.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"p-locate": "^5.0.0"
@@ -41849,7 +41898,7 @@
},
"node_modules/log-symbols": {
"version": "4.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"chalk": "^4.1.0",
@@ -41970,7 +42019,7 @@
},
"node_modules/logkitty": {
"version": "0.7.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-fragments": "^0.2.1",
@@ -41983,7 +42032,7 @@
},
"node_modules/logkitty/node_modules/cliui": {
"version": "6.0.0",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"dependencies": {
"string-width": "^4.2.0",
@@ -41993,7 +42042,7 @@
},
"node_modules/logkitty/node_modules/decamelize": {
"version": "1.2.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@@ -42001,7 +42050,7 @@
},
"node_modules/logkitty/node_modules/find-up": {
"version": "4.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"locate-path": "^5.0.0",
@@ -42013,7 +42062,7 @@
},
"node_modules/logkitty/node_modules/locate-path": {
"version": "5.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"p-locate": "^4.1.0"
@@ -42024,7 +42073,7 @@
},
"node_modules/logkitty/node_modules/p-limit": {
"version": "2.3.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"p-try": "^2.0.0"
@@ -42038,7 +42087,7 @@
},
"node_modules/logkitty/node_modules/p-locate": {
"version": "4.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"p-limit": "^2.2.0"
@@ -42049,7 +42098,7 @@
},
"node_modules/logkitty/node_modules/path-exists": {
"version": "4.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=8"
@@ -42057,7 +42106,7 @@
},
"node_modules/logkitty/node_modules/strip-ansi": {
"version": "6.0.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-regex": "^5.0.1"
@@ -42068,7 +42117,7 @@
},
"node_modules/logkitty/node_modules/wrap-ansi": {
"version": "6.2.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-styles": "^4.0.0",
@@ -42081,12 +42130,12 @@
},
"node_modules/logkitty/node_modules/y18n": {
"version": "4.0.3",
- "devOptional": true,
+ "dev": true,
"license": "ISC"
},
"node_modules/logkitty/node_modules/yargs": {
"version": "15.4.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"cliui": "^6.0.0",
@@ -42107,7 +42156,7 @@
},
"node_modules/logkitty/node_modules/yargs-parser": {
"version": "18.1.3",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"dependencies": {
"camelcase": "^5.0.0",
@@ -42213,7 +42262,7 @@
},
"node_modules/merge2": {
"version": "1.4.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">= 8"
@@ -42658,7 +42707,7 @@
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
- "devOptional": true,
+ "dev": true,
"bin": {
"mime": "cli.js"
},
@@ -42857,7 +42906,7 @@
},
"node_modules/nocache": {
"version": "3.0.4",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=12.0.0"
@@ -42906,7 +42955,7 @@
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
"integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=0.12.0"
@@ -43104,7 +43153,7 @@
},
"node_modules/on-headers": {
"version": "1.0.2",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.8"
@@ -43162,7 +43211,7 @@
},
"node_modules/ora": {
"version": "5.4.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"bl": "^4.1.0",
@@ -43184,7 +43233,7 @@
},
"node_modules/ora/node_modules/strip-ansi": {
"version": "6.0.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-regex": "^5.0.1"
@@ -43231,7 +43280,7 @@
},
"node_modules/p-limit": {
"version": "3.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"yocto-queue": "^0.1.0"
@@ -43245,7 +43294,7 @@
},
"node_modules/p-locate": {
"version": "5.0.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"p-limit": "^3.0.2"
@@ -43286,7 +43335,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "devOptional": true,
+ "dev": true,
"dependencies": {
"callsites": "^3.0.0"
},
@@ -43298,7 +43347,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "devOptional": true,
+ "dev": true,
"engines": {
"node": ">=6"
}
@@ -43783,7 +43832,7 @@
},
"node_modules/prompts": {
"version": "2.4.2",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"kleur": "^3.0.3",
@@ -44041,7 +44090,7 @@
},
"node_modules/queue-microtask": {
"version": "1.2.3",
- "devOptional": true,
+ "dev": true,
"funding": [
{
"type": "github",
@@ -44114,30 +44163,6 @@
}
}
},
- "node_modules/react-dom": {
- "version": "18.3.1",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
- "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
- "license": "MIT",
- "peer": true,
- "dependencies": {
- "loose-envify": "^1.1.0",
- "scheduler": "^0.23.2"
- },
- "peerDependencies": {
- "react": "^18.3.1"
- }
- },
- "node_modules/react-dom/node_modules/scheduler": {
- "version": "0.23.2",
- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
- "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
- "license": "MIT",
- "peer": true,
- "dependencies": {
- "loose-envify": "^1.1.0"
- }
- },
"node_modules/react-freeze": {
"version": "1.0.3",
"license": "MIT",
@@ -45293,7 +45318,7 @@
},
"node_modules/restore-cursor": {
"version": "3.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"onetime": "^5.1.0",
@@ -45359,7 +45384,7 @@
},
"node_modules/run-parallel": {
"version": "1.2.0",
- "devOptional": true,
+ "dev": true,
"funding": [
{
"type": "github",
@@ -45876,7 +45901,7 @@
},
"node_modules/sisteransi": {
"version": "1.0.5",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/slash": {
@@ -45889,7 +45914,7 @@
},
"node_modules/slice-ansi": {
"version": "2.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-styles": "^3.2.0",
@@ -45902,7 +45927,7 @@
},
"node_modules/slice-ansi/node_modules/ansi-styles": {
"version": "3.2.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"color-convert": "^1.9.0"
@@ -45913,7 +45938,7 @@
},
"node_modules/slice-ansi/node_modules/color-convert": {
"version": "1.9.3",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"color-name": "1.1.3"
@@ -45921,7 +45946,7 @@
},
"node_modules/slice-ansi/node_modules/color-name": {
"version": "1.1.3",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/sonic-boom": {
@@ -46370,7 +46395,7 @@
},
"node_modules/strip-ansi": {
"version": "5.2.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"ansi-regex": "^4.1.0"
@@ -46394,7 +46419,7 @@
},
"node_modules/strip-ansi/node_modules/ansi-regex": {
"version": "4.1.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=6"
@@ -46428,7 +46453,7 @@
},
"node_modules/strnum": {
"version": "1.0.5",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/strtok3": {
@@ -46448,7 +46473,7 @@
},
"node_modules/sudo-prompt": {
"version": "9.2.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/supports-color": {
@@ -47393,7 +47418,7 @@
},
"node_modules/wcwidth": {
"version": "1.0.1",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"dependencies": {
"defaults": "^1.0.3"
@@ -47705,7 +47730,7 @@
},
"node_modules/yaml": {
"version": "2.3.1",
- "devOptional": true,
+ "dev": true,
"license": "ISC",
"engines": {
"node": ">= 14"
@@ -47768,7 +47793,7 @@
},
"node_modules/yocto-queue": {
"version": "0.1.0",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
diff --git a/packages/editor-mobile/public/index.html b/packages/editor-mobile/public/index.html
index bf28491b8..84c861a5d 100644
--- a/packages/editor-mobile/public/index.html
+++ b/packages/editor-mobile/public/index.html
@@ -16,8 +16,8 @@
}
/* p { */
- /* font-family: "Inter"; */
- /* color: var(--nn_primary_paragraph) ## TODO: use fixed color */
+ /* font-family: "Inter"; */
+ /* color: var(--nn_primary_paragraph) ## TODO: use fixed color */
/* } */
::selection {
@@ -33,6 +33,10 @@
color: var(--nn_primary_placeholder) !important;
}
+ .main-editor *:first-child {
+ margin-top: 0.5em !important;
+ }
+
#root {
height: 100%;
display: flex;
diff --git a/packages/editor-mobile/src/components/editor.tsx b/packages/editor-mobile/src/components/editor.tsx
index be3761ca0..8b14fde8c 100644
--- a/packages/editor-mobile/src/components/editor.tsx
+++ b/packages/editor-mobile/src/components/editor.tsx
@@ -558,12 +558,28 @@ const Tiptap = ({
height: "100%",
display: "flex",
flexDirection: "column",
- position: "relative"
+ position: "relative",
+ paddingTop: "12px"
}}
>
{settings.noHeader || tab.session?.locked ? null : (
<>
- <Tags settings={settings} loading={controller.loading} />
+ <div
+ style={{
+ flexDirection: "row",
+ justifyContent: "space-between",
+ display: "flex",
+ alignItems: "center",
+ padding: "0px 16px"
+ }}
+ >
+ <Tags settings={settings} loading={controller.loading} />
+ <StatusBar
+ container={containerRef}
+ loading={controller.loading}
+ />
+ </div>
+
<Title
titlePlaceholder={controller.titlePlaceholder}
readonly={settings.readonly}
@@ -574,11 +590,6 @@ const Tiptap = ({
timeFormat={settings.timeFormat}
loading={controller.loading}
/>
-
- <StatusBar
- container={containerRef}
- loading={controller.loading}
- />
</>
)}
@@ -918,7 +929,7 @@ const TiptapProvider = (): JSX.Element => {
editorContainer.classList.add("selectable", "main-editor", "searching");
editorContainer.style.flex = "1";
editorContainer.style.cursor = "text";
- editorContainer.style.padding = "0px 12px";
+ editorContainer.style.padding = "0px 16px";
editorContainer.style.color = colors.primary.paragraph;
editorContainer.style.fontSize = `${settings.fontSize}px`;
editorContainer.style.fontFamily =
diff --git a/packages/editor-mobile/src/components/header.tsx b/packages/editor-mobile/src/components/header.tsx
index 221eca76f..5a0200ae7 100644
--- a/packages/editor-mobile/src/components/header.tsx
+++ b/packages/editor-mobile/src/components/header.tsx
@@ -58,6 +58,43 @@ const MenuItem = (props: any) => (
<MenuItemInner {...props} className={menuItemClassName} />
);
+const iconButtonStyle: React.CSSProperties = {
+ borderWidth: 0,
+ borderRadius: 100,
+ color: "var(--nn_primary_icon)",
+ width: 39,
+ height: 39,
+ display: "flex",
+ justifyContent: "center",
+ alignItems: "center",
+ position: "relative"
+};
+
+function IconButton({
+ onPress,
+ children,
+ fwdRef,
+ style = {},
+ preventDefault = false
+}: {
+ onPress?: () => void;
+ children: React.ReactNode;
+ fwdRef?: any;
+ style?: React.CSSProperties;
+ preventDefault?: boolean;
+}) {
+ return (
+ <Button
+ onPress={onPress}
+ fwdRef={fwdRef}
+ preventDefault={preventDefault}
+ style={{ ...iconButtonStyle, ...style }}
+ >
+ {children}
+ </Button>
+ );
+}
+
const Button = ({
onPress,
children,
@@ -120,7 +157,8 @@ function Header({
backgroundColor: "var(--nn_primary_background)",
position: "sticky",
width: "100vw",
- zIndex: 999
+ zIndex: 999,
+ borderBottom: "0.5px solid var(--nn_primary_separator)"
}}
>
{noHeader ? null : (
@@ -132,51 +170,39 @@ function Header({
flexDirection: "row",
paddingTop: insets.top,
height: 50,
- alignItems: "center"
+ alignItems: "center",
+ paddingLeft: 12,
+ paddingRight: 16
}}
id="header"
>
{settings.deviceMode !== "mobile" && !settings.fullscreen ? (
<div />
) : (
- <Button
+ <IconButton
onPress={() => {
post(EditorEvents.back, undefined, tab.id, tab.session?.noteId);
}}
- preventDefault={false}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginLeft: 6,
- width: 40,
- height: 40,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- flexDirection: "column",
- position: "relative"
- }}
+ style={{ width: 40, height: 40 }}
>
<ArrowBackIcon
- size={28 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ size={25 * settings.fontScale}
+ style={{ position: "absolute" }}
color="var(--nn_primary_icon)"
/>
- </Button>
+ </IconButton>
)}
<div
style={{
display: "flex",
alignItems: "center",
- flexDirection: "row"
+ flexDirection: "row",
+ gap: 8
}}
>
{settings.deviceMode !== "mobile" && !settings.fullscreen ? (
- <Button
+ <IconButton
onPress={() => {
post(
EditorEvents.fullscreen,
@@ -185,32 +211,17 @@ function Header({
tab.session?.noteId
);
}}
- preventDefault={false}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginRight: 10,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<FullscreenIcon
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
color="var(--nn_primary_icon)"
/>
- </Button>
+ </IconButton>
) : null}
{tab.session?.readonly ? (
- <Button
+ <IconButton
onPress={() => {
post(
"editor-events:disable-readonly-mode",
@@ -218,46 +229,20 @@ function Header({
);
}}
fwdRef={btnRef}
- preventDefault={false}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_accent)",
- marginRight: 12,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
+ style={{ color: "var(--nn_primary_accent)" }}
>
<PencilLockIcon
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
color="var(--nn_primary_accent)"
/>
- </Button>
+ </IconButton>
) : null}
- <Button
+ <IconButton
onPress={() => {
editor?.commands.undo();
}}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginRight: 10,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<ArrowULeftTopIcon
color={
@@ -266,28 +251,14 @@ function Header({
: "var(--nn_primary_icon)"
}
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
/>
- </Button>
+ </IconButton>
- <Button
+ <IconButton
onPress={() => {
editor?.commands.redo();
}}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginRight: 10,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<ArrowURightTopIcon
color={
@@ -296,13 +267,11 @@ function Header({
: "var(--nn_primary_icon)"
}
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
/>
- </Button>
+ </IconButton>
- <Button
+ <IconButton
onPress={() => {
post(
EditorEvents.showTabs,
@@ -311,26 +280,13 @@ function Header({
tab.session?.noteId
);
}}
- preventDefault={false}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginRight: 12,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<div
style={{
border: "2px solid var(--nn_primary_icon)",
- width: 19 * settings.fontScale,
- height: 19 * settings.fontScale,
- minWidth: 19 * settings.fontScale,
+ width: 17 * settings.fontScale,
+ height: 17 * settings.fontScale,
+ minWidth: 17 * settings.fontScale,
borderRadius: 5,
display: "flex",
justifyContent: "center",
@@ -348,9 +304,9 @@ function Header({
{openedTabsCount}
</p>
</div>
- </Button>
+ </IconButton>
- <Button
+ <IconButton
fwdRef={btnRef}
onPress={() => {
if (tab.session?.locked) {
@@ -364,38 +320,21 @@ function Header({
setOpen(!isOpen);
}
}}
- preventDefault={false}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- marginRight: 12,
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
{tab.session?.locked ? (
<DotsHorizontalIcon
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
color="var(--nn_primary_icon)"
/>
) : (
<DotsVerticalIcon
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
color="var(--nn_primary_icon)"
/>
)}
- </Button>
+ </IconButton>
<ControlledMenu
align="end"
@@ -470,7 +409,7 @@ function Header({
<div
style={{
display: "flex",
- gap: 10,
+ gap: 8,
alignItems: "center",
flexDirection: "row",
justifyContent: "center",
@@ -478,7 +417,7 @@ function Header({
paddingTop: 5
}}
>
- <Button
+ <IconButton
onPress={() => {
post(
EditorEvents.goBack,
@@ -488,17 +427,6 @@ function Header({
);
setOpen(false);
}}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<ArrowBackIcon
color={
@@ -507,13 +435,11 @@ function Header({
: "var(--nn_primary_icon)"
}
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
/>
- </Button>
+ </IconButton>
- <Button
+ <IconButton
onPress={() => {
post(
EditorEvents.goForward,
@@ -523,17 +449,6 @@ function Header({
);
setOpen(false);
}}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<ArrowForwardIcon
color={
@@ -542,37 +457,22 @@ function Header({
: "var(--nn_primary_icon)"
}
size={25 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ style={{ position: "absolute" }}
/>
- </Button>
+ </IconButton>
- <Button
+ <IconButton
onPress={() => {
editor?.commands.startSearch();
setOpen(false);
}}
- style={{
- borderWidth: 0,
- borderRadius: 100,
- color: "var(--nn_primary_icon)",
- width: 39,
- height: 39,
- display: "flex",
- justifyContent: "center",
- alignItems: "center",
- position: "relative"
- }}
>
<MagnifyIcon
- size={28 * settings.fontScale}
- style={{
- position: "absolute"
- }}
+ size={25 * settings.fontScale}
+ style={{ position: "absolute" }}
color="var(--nn_primary_icon)"
/>
- </Button>
+ </IconButton>
</div>
<MenuItem
@@ -584,7 +484,7 @@ function Header({
}}
>
<PlusIcon
- size={22 * settings.fontScale}
+ size={20 * settings.fontScale}
color="var(--nn_primary_icon)"
/>
<span
@@ -605,7 +505,7 @@ function Header({
}}
>
<TableOfContentsIcon
- size={22 * settings.fontScale}
+ size={20 * settings.fontScale}
color="var(--nn_primary_icon)"
/>
<span
@@ -625,7 +525,7 @@ function Header({
}}
>
<ArrowTopIcon
- size={22 * settings.fontScale}
+ size={20 * settings.fontScale}
color="var(--nn_primary_icon)"
/>
<span
@@ -646,7 +546,7 @@ function Header({
}}
>
<ArrowDownIcon
- size={22 * settings.fontScale}
+ size={20 * settings.fontScale}
color="var(--nn_primary_icon)"
/>
<span
@@ -666,7 +566,7 @@ function Header({
}}
>
<DotsHorizontalIcon
- size={22 * settings.fontScale}
+ size={20 * settings.fontScale}
color="var(--nn_primary_icon)"
/>
<span
diff --git a/packages/editor-mobile/src/components/statusbar.tsx b/packages/editor-mobile/src/components/statusbar.tsx
index 5f72d2b2e..06832faf4 100644
--- a/packages/editor-mobile/src/components/statusbar.tsx
+++ b/packages/editor-mobile/src/components/statusbar.tsx
@@ -29,19 +29,13 @@ function StatusBar({
container: RefObject<HTMLDivElement>;
loading?: boolean;
}) {
- const [status, setStatus] = useState({
- date: "",
- saved: ""
- });
const tab = useTabContext();
- const [sticky, setSticky] = useState(false);
- const stickyRef = useRef(false);
- const prevScroll = useRef(0);
- const lastStickyChangeTime = useRef(0);
+ const [showChars, setShowChars] = useState(false);
const [words, setWords] = useState(strings.totalWords(0));
const currentWords = useRef(words);
+ const [chars, setChars] = useState(0);
const statusBar = useRef({
- set: setStatus,
+ set: () => {},
updateWords: () => {
const editor = editors[tab.id];
if (!editor) return;
@@ -57,110 +51,44 @@ function StatusBar({
useEffect(() => {
globalThis.statusBars[tab.id] = statusBar;
- return () => {
- globalThis.statusBars[tab.id] = undefined;
- };
- }, [tab.id, statusBar]);
-
- const scrollState = useRef({
- isMovingUp: false,
- startingOffset: 0
- });
- const onScroll = React.useCallback((event: Event) => {
- const currentOffset = (event.target as HTMLElement)?.scrollTop;
- if (currentOffset < 200) {
- if (stickyRef.current) {
- stickyRef.current = false;
- setSticky(false);
- lastStickyChangeTime.current = Date.now();
- prevScroll.current = currentOffset;
- }
- return;
+ if (showChars) {
+ editors[tab.id]?.on("selectionUpdate", (event) => {
+ setChars(event.editor.extensionStorage.characterCount.characters());
+ });
}
- if (Date.now() - lastStickyChangeTime.current < 300) return;
- if (currentOffset > prevScroll.current) {
- if (
- !scrollState.current.startingOffset ||
- scrollState.current.isMovingUp
- ) {
- scrollState.current.startingOffset = currentOffset;
- }
- scrollState.current.isMovingUp = false;
- } else {
- if (
- !scrollState.current.startingOffset ||
- !scrollState.current.isMovingUp
- ) {
- scrollState.current.startingOffset = currentOffset;
- }
- scrollState.current.isMovingUp = true;
+ if (editors[tab.id]) {
+ setChars(
+ editors[tab.id]?.extensionStorage.characterCount.characters() || 0
+ );
}
- if (scrollState.current.isMovingUp) {
- if (currentOffset < scrollState.current.startingOffset - 50) {
- if (!stickyRef.current) {
- stickyRef.current = true;
- setSticky(true);
- }
- scrollState.current.startingOffset = 0;
- }
- } else {
- if (currentOffset > scrollState.current.startingOffset + 50) {
- if (stickyRef.current) {
- stickyRef.current = false;
- setSticky(false);
- }
- scrollState.current.startingOffset = 0;
- }
- }
- lastStickyChangeTime.current = Date.now();
- prevScroll.current = currentOffset;
- }, []);
+ return () => {
+ globalThis.statusBars[tab.id] = undefined;
+ };
+ }, [tab.id, statusBar, showChars]);
useEffect(() => {
currentWords.current = words;
}, [words]);
- useEffect(() => {
- const node = container.current;
- node?.addEventListener("scroll", onScroll);
- return () => {
- node?.removeEventListener("scroll", onScroll);
- };
- }, [onScroll, container]);
-
const paragraphStyle: React.CSSProperties = {
marginTop: 0,
marginBottom: 0,
- fontSize: "12px",
+ fontSize: 12,
color: "var(--nn_secondary_paragraph)",
- marginRight: 8,
paddingBottom: 0,
- userSelect: "none",
- pointerEvents: "none"
+ userSelect: "none"
};
return (
- <div
- style={{
- flexDirection: "row",
- display: loading ? "none" : "flex",
- paddingRight: 12,
- paddingLeft: 12,
- position: sticky ? "sticky" : "relative",
- top: -3,
- backgroundColor: "var(--nn_primary_background)",
- zIndex: 10,
- justifyContent: sticky ? "center" : "flex-start",
- paddingTop: 4,
- paddingBottom: 2
+ <p
+ onMouseDown={(e) => {
+ setShowChars(!showChars);
}}
- id="statusbar"
+ style={paragraphStyle}
>
- <p style={paragraphStyle}>{words}</p>
- <p style={paragraphStyle}>{status.date}</p>
- <p style={paragraphStyle}>{status.saved}</p>
- </div>
+ {showChars ? strings.characters(chars) : words}
+ </p>
);
}
diff --git a/packages/editor-mobile/src/components/styles.module.css b/packages/editor-mobile/src/components/styles.module.css
index ae8cf5bbc..5127507ea 100644
--- a/packages/editor-mobile/src/components/styles.module.css
+++ b/packages/editor-mobile/src/components/styles.module.css
@@ -50,14 +50,15 @@
z-index: 999;
list-style: none;
user-select: none;
- padding: 0px;
font-family: sans-serif;
font-size: 0.95em;
border: 1px solid var(--nn_primary_border);
box-shadow: 1px 1px 20px 1px rgba(0, 0, 0, 0.1);
- border-radius: 6px;
+ border-radius: 8px;
background-color: var(--nn_secondary_background);
- min-width: 12rem;
+ min-width: 13rem;
+ padding: 0 !important;
+
}
.menuOpening {
@@ -73,10 +74,11 @@
.menuItem {
cursor: pointer;
border-radius: 0;
- padding: 1rem 0.6rem !important;
+ padding: 0.5rem 0.6rem !important;
color: var(--nn_primary_paragraph);
font-family: "Inter";
- padding: 12px 6px;
+ font-size: 0.9em;
+ flex-wrap: nowrap;
}
.menuItemHover {
diff --git a/packages/editor-mobile/src/components/tags.tsx b/packages/editor-mobile/src/components/tags.tsx
index 1968e13a5..a5cdc4c29 100644
--- a/packages/editor-mobile/src/components/tags.tsx
+++ b/packages/editor-mobile/src/components/tags.tsx
@@ -22,7 +22,6 @@ import { Settings } from "../utils";
import { EditorEvents } from "../utils/editor-events";
import styles from "./styles.module.css";
import { useTabContext } from "../hooks/useTabStore";
-import { strings } from "@notesnook/intl";
function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
const [tags, setTags] = useState<
@@ -54,80 +53,32 @@ function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
<div
className={styles.container}
style={{
- padding: "0px 12px",
display: "flex",
alignItems: "center",
overflowX: "scroll",
minHeight: "40px",
- opacity: props.loading ? 0 : 1
+ opacity: props.loading ? 0 : 1,
+ gap: 6
}}
>
- <button
- className={styles.btn}
- onClick={(e) => {
- e.preventDefault();
- openManageTagsSheet();
- }}
- style={{
- border: `1px solid var(--nn_primary_border)`,
- backgroundColor: "var(--nn_secondary_background)",
- marginRight: 5,
- borderRadius: 100,
- padding: "0px 10px",
- fontFamily: "Inter",
- display: "flex",
- alignItems: "center",
- height: "30px",
- userSelect: "none",
- WebkitUserSelect: "none"
- }}
- >
- {tags.length === 0 ? (
- <p
- style={{
- marginRight: 4,
- fontSize: 13,
- color: "var(--nn_primary_icon)",
- userSelect: "none"
- }}
- >
- {strings.addATag()}
- </p>
- ) : null}
- <svg
- xmlns="http://www.w3.org/2000/svg"
- version="1.1"
- width={20 * fontScale}
- height={20 * fontScale}
- viewBox={`0 0 24 24`}
- >
- <path
- fill="var(--nn_primary_accent)"
- d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
- />
- </svg>
- </button>
-
{tags.map((tag) => (
<button
key={tag.title}
- className={styles.btn}
style={{
border: "1px solid var(--nn_primary_border)",
backgroundColor: "var(--nn_secondary_background)",
- marginRight: 5,
- borderRadius: 100,
- padding: "0px 10px",
- height: "30px",
+ borderRadius: 6,
+ padding: "0px 4px",
+ height: "24px",
fontFamily: "Inter",
- fontSize: 13,
+ fontSize: 12,
color: "var(--nn_primary_icon)",
userSelect: "none",
WebkitUserSelect: "none"
}}
onClick={(e) => {
e.preventDefault();
- post(EditorEvents.tag, tag, tab.id, tab.session?.noteId);
+ openManageTagsSheet();
}}
>
#{tag.alias}
diff --git a/packages/editor-mobile/src/components/title.tsx b/packages/editor-mobile/src/components/title.tsx
index 48a1f84bd..6dd6675b7 100644
--- a/packages/editor-mobile/src/components/title.tsx
+++ b/packages/editor-mobile/src/components/title.tsx
@@ -49,9 +49,9 @@ function Title({
if (!titleSizeDiv.current || !titleRef.current) return;
titleSizeDiv.current.innerText = titleRef.current.value;
titleRef.current.style.height = `${titleSizeDiv.current.clientHeight}px`;
+ titleRef.current.style.minHeight = `${titleSizeDiv.current.clientHeight}px`;
titleSizeDiv.current.style.width = `${titleRef.current.clientWidth}px`;
}, []);
-
useEffect(() => {
if (titleRef.current) {
titleRef.current.value = title;
@@ -88,8 +88,8 @@ function Title({
maxWidth: "100%",
minHeight: 40,
opacity: 0,
- paddingRight: 10,
- paddingLeft: 10,
+ paddingRight: 16,
+ paddingLeft: 16,
fontWeight: 600,
fontFamily: getFontById(fontFamily)?.font || "Inter",
boxSizing: "border-box",
@@ -119,8 +119,8 @@ function Title({
boxSizing: "border-box",
border: 0,
opacity: 1,
- paddingRight: 10,
- paddingLeft: 10,
+ paddingRight: 16,
+ paddingLeft: 16,
fontWeight: 600,
fontFamily: getFontById(fontFamily)?.font || "Inter",
backgroundColor: "transparent",
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index d0122476e..6fa1f2500 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -491,6 +491,10 @@ msgstr "{count, plural, one {Unpublish item} other {Unpublish # items}}"
msgid "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
msgstr "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
+#: src/strings.ts:2492
+msgid "{count} characters"
+msgstr "{count} characters"
+
#: src/strings.ts:1563
msgid "{days, plural, one {1 day} other {# days}}"
msgstr "{days, plural, one {1 day} other {# days}}"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 51e86dcff..47d12b9bc 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -491,6 +491,10 @@ msgstr ""
msgid "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
msgstr ""
+#: src/strings.ts:2492
+msgid "{count} characters"
+msgstr ""
+
#: src/strings.ts:1563
msgid "{days, plural, one {1 day} other {# days}}"
msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 70ce5cf77..4f1c52792 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2488,5 +2488,6 @@ Use this if changes from other devices are not appearing on this device. This wi
t`Select a notebook to move this notebook into, or unselect to move it to the root level.`,
noNotebooksSelectedToMove: () => t`No notebooks selected to move`,
scrollToTop: () => t`Scroll to top`,
- scrollToBottom: () => t`Scroll to bottom`
+ scrollToBottom: () => t`Scroll to bottom`,
+ characters: (count: number) => t`${count} characters`
};