diff --git a/web/package.json b/web/package.json index e36918e87..8dcf1f3cb 100644 --- a/web/package.json +++ b/web/package.json @@ -19,7 +19,7 @@ "@mui/joy": "5.0.0-beta.48", "@radix-ui/react-popover": "^1.1.2", "@reduxjs/toolkit": "^2.3.0", - "@usememos/mui": "0.0.1-alpha.14", + "@usememos/mui": "0.0.1-alpha.20", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "copy-to-clipboard": "^3.3.3", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 8304698d5..ccaa518af 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^2.3.0 version: 2.3.0(react-redux@9.1.2(@types/react@18.3.12)(react@18.3.1)(redux@5.0.1))(react@18.3.1) '@usememos/mui': - specifier: 0.0.1-alpha.14 - version: 0.0.1-alpha.14(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14) + specifier: 0.0.1-alpha.20 + version: 0.0.1-alpha.20(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14) class-variance-authority: specifier: ^0.7.0 version: 0.7.0 @@ -1409,8 +1409,8 @@ packages: '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} - '@usememos/mui@0.0.1-alpha.14': - resolution: {integrity: sha512-KzLIWkTPVisukxfa6j9LtCmlJpO3QxOe9JFwUDV6AkIqw4QKkVK6Rl+DZu8N9uKSoAiNbg6gbu9vj+Ox3crmug==} + '@usememos/mui@0.0.1-alpha.20': + resolution: {integrity: sha512-O0wvI5z+ndKHLek+Be5t8e+KOSxPf0gHKJh8wu+M05bSzMldqs1dlm0kaP4bSW5rUifOybrEe0IUsesyg+eJzQ==} peerDependencies: lucide-react: ^0.453.0 postcss: ^8.4.47 @@ -4642,7 +4642,7 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@usememos/mui@0.0.1-alpha.14(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)': + '@usememos/mui@0.0.1-alpha.20(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)': dependencies: lucide-react: 0.453.0(react@18.3.1) postcss: 8.4.47 diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsx index f1aafe41e..c732e1e1e 100644 --- a/web/src/components/ChangeMemberPasswordDialog.tsx +++ b/web/src/components/ChangeMemberPasswordDialog.tsx @@ -1,5 +1,4 @@ -import { Input } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Button, Input } from "@usememos/mui"; import { XIcon } from "lucide-react"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; diff --git a/web/src/components/CreateAccessTokenDialog.tsx b/web/src/components/CreateAccessTokenDialog.tsx index 0cc22523c..e46cec33e 100644 --- a/web/src/components/CreateAccessTokenDialog.tsx +++ b/web/src/components/CreateAccessTokenDialog.tsx @@ -1,5 +1,5 @@ -import { Input, Radio, RadioGroup } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Radio, RadioGroup } from "@mui/joy"; +import { Button, Input } from "@usememos/mui"; import { XIcon } from "lucide-react"; import React, { useState } from "react"; import { toast } from "react-hot-toast"; diff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsx index 67574e496..b835a20e6 100644 --- a/web/src/components/CreateIdentityProviderDialog.tsx +++ b/web/src/components/CreateIdentityProviderDialog.tsx @@ -1,5 +1,5 @@ -import { Divider, Input, Option, Select, Typography } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Divider, Option, Select, Typography } from "@mui/joy"; +import { Button, Input } from "@usememos/mui"; import { XIcon } from "lucide-react"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; diff --git a/web/src/components/CreateWebhookDialog.tsx b/web/src/components/CreateWebhookDialog.tsx index 03d5583d9..441e16075 100644 --- a/web/src/components/CreateWebhookDialog.tsx +++ b/web/src/components/CreateWebhookDialog.tsx @@ -1,5 +1,4 @@ -import { Input } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Button, Input } from "@usememos/mui"; import { XIcon } from "lucide-react"; import React, { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; diff --git a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx index 2e91a400a..862803f01 100644 --- a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx +++ b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx @@ -1,5 +1,4 @@ -import { Input } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Button, Input } from "@usememos/mui"; import { LatLng } from "leaflet"; import { MapPinIcon, XIcon } from "lucide-react"; import { useEffect, useState } from "react"; @@ -111,19 +110,19 @@ const LocationSelector = (props: Props) => {
- - [{state.position.lat.toFixed(3)}, {state.position.lng.toFixed(3)}] - - ) : null - } - onChange={(e) => setState((state) => ({ ...state, placeholder: e.target.value }))} - /> +
+ {state.position && ( + + [{state.position.lat.toFixed(2)}, {state.position.lng.toFixed(2)}] + + )} + setState((state) => ({ ...state, placeholder: e.target.value }))} + /> +
{workspaceStorageSetting.storageType !== WorkspaceStorageSetting_StorageType.DATABASE && (
diff --git a/web/src/components/UpdateAccountDialog.tsx b/web/src/components/UpdateAccountDialog.tsx index 64c6950a1..4eee39fd6 100644 --- a/web/src/components/UpdateAccountDialog.tsx +++ b/web/src/components/UpdateAccountDialog.tsx @@ -1,5 +1,5 @@ -import { Input, Textarea } from "@mui/joy"; -import { Button } from "@usememos/mui"; +import { Textarea } from "@mui/joy"; +import { Button, Input } from "@usememos/mui"; import { isEqual } from "lodash-es"; import { XIcon } from "lucide-react"; import { useState } from "react"; @@ -193,7 +193,7 @@ const UpdateAccountDialog: React.FC = ({ destroy }: Props) => { {t("common.email")} ({t("setting.account-section.email-note")})

- +

{t("common.description")}