@churchapps/apphelper 0.18.0 → 0.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/ImageEditor.d.ts.map +1 -1
- package/dist/components/ImageEditor.js +0 -2
- package/dist/components/ImageEditor.js.map +1 -1
- package/dist/components/PageHeader.d.ts +4 -0
- package/dist/components/PageHeader.d.ts.map +1 -1
- package/dist/components/PageHeader.js +23 -26
- package/dist/components/PageHeader.js.map +1 -1
- package/dist/components/conversations/Conversations.d.ts +1 -7
- package/dist/components/conversations/Conversations.d.ts.map +1 -1
- package/dist/components/conversations/Conversations.js +1 -7
- package/dist/components/conversations/Conversations.js.map +1 -1
- package/dist/components/header/SiteHeader.d.ts.map +1 -1
- package/dist/components/header/SiteHeader.js +8 -12
- package/dist/components/header/SiteHeader.js.map +1 -1
- package/dist/components/notes/AddNote.d.ts.map +1 -1
- package/dist/components/notes/AddNote.js +2 -6
- package/dist/components/notes/AddNote.js.map +1 -1
- package/dist/components/notes/Notes.d.ts.map +1 -1
- package/dist/components/notes/Notes.js +3 -8
- package/dist/components/notes/Notes.js.map +1 -1
- package/dist/components/notes/SubscriptionToggle.d.ts +3 -19
- package/dist/components/notes/SubscriptionToggle.d.ts.map +1 -1
- package/dist/components/notes/SubscriptionToggle.js +3 -19
- package/dist/components/notes/SubscriptionToggle.js.map +1 -1
- package/dist/components/wrapper/PrivateMessageDetails.d.ts.map +1 -1
- package/dist/components/wrapper/PrivateMessageDetails.js +0 -2
- package/dist/components/wrapper/PrivateMessageDetails.js.map +1 -1
- package/dist/donations/components/CardForm.js.map +1 -1
- package/dist/donations/components/KingdomFundingTokenForm.d.ts.map +1 -1
- package/dist/donations/components/KingdomFundingTokenForm.js +2 -6
- package/dist/donations/components/KingdomFundingTokenForm.js.map +1 -1
- package/dist/donations/components/MultiGatewayDonationForm.d.ts.map +1 -1
- package/dist/donations/components/MultiGatewayDonationForm.js +8 -18
- package/dist/donations/components/MultiGatewayDonationForm.js.map +1 -1
- package/dist/donations/components/NonAuthDonation.d.ts.map +1 -1
- package/dist/donations/components/NonAuthDonation.js +0 -3
- package/dist/donations/components/NonAuthDonation.js.map +1 -1
- package/dist/donations/components/NonAuthDonationInner.d.ts.map +1 -1
- package/dist/donations/components/NonAuthDonationInner.js +1 -9
- package/dist/donations/components/NonAuthDonationInner.js.map +1 -1
- package/dist/donations/components/PayPalHostedFields.d.ts.map +1 -1
- package/dist/donations/components/PayPalHostedFields.js +0 -1
- package/dist/donations/components/PayPalHostedFields.js.map +1 -1
- package/dist/donations/components/PayPalNonAuthDonationInner.d.ts.map +1 -1
- package/dist/donations/components/PayPalNonAuthDonationInner.js +3 -11
- package/dist/donations/components/PayPalNonAuthDonationInner.js.map +1 -1
- package/dist/donations/components/PaymentMethods.d.ts.map +1 -1
- package/dist/donations/components/PaymentMethods.js +3 -14
- package/dist/donations/components/PaymentMethods.js.map +1 -1
- package/dist/donations/components/RecurringDonations.d.ts.map +1 -1
- package/dist/donations/components/RecurringDonations.js +1 -6
- package/dist/donations/components/RecurringDonations.js.map +1 -1
- package/dist/donations/helpers/DonationHelper.d.ts.map +1 -1
- package/dist/donations/helpers/DonationHelper.js +1 -4
- package/dist/donations/helpers/DonationHelper.js.map +1 -1
- package/dist/donations/providers/PayPalProvider.d.ts.map +1 -1
- package/dist/donations/providers/PayPalProvider.js +2 -9
- package/dist/donations/providers/PayPalProvider.js.map +1 -1
- package/dist/donations/providers/StripeInstanceContext.d.ts.map +1 -1
- package/dist/donations/providers/StripeInstanceContext.js +1 -3
- package/dist/donations/providers/StripeInstanceContext.js.map +1 -1
- package/dist/donations/providers/StripeProvider.d.ts.map +1 -1
- package/dist/donations/providers/StripeProvider.js +4 -12
- package/dist/donations/providers/StripeProvider.js.map +1 -1
- package/dist/donations/providers/index.d.ts.map +1 -1
- package/dist/donations/providers/index.js +0 -3
- package/dist/donations/providers/index.js.map +1 -1
- package/dist/donations/providers/registry.d.ts.map +1 -1
- package/dist/donations/providers/registry.js +1 -3
- package/dist/donations/providers/registry.js.map +1 -1
- package/dist/donations/providers/types.d.ts +2 -0
- package/dist/donations/providers/types.d.ts.map +1 -1
- package/dist/forms/components/FormSubmissionEdit.d.ts.map +1 -1
- package/dist/forms/components/FormSubmissionEdit.js +0 -3
- package/dist/forms/components/FormSubmissionEdit.js.map +1 -1
- package/dist/helpers/ConversationStore.d.ts +1 -13
- package/dist/helpers/ConversationStore.d.ts.map +1 -1
- package/dist/helpers/ConversationStore.js +4 -21
- package/dist/helpers/ConversationStore.js.map +1 -1
- package/dist/helpers/NotificationService.d.ts +0 -34
- package/dist/helpers/NotificationService.d.ts.map +1 -1
- package/dist/helpers/NotificationService.js +2 -59
- package/dist/helpers/NotificationService.js.map +1 -1
- package/dist/helpers/PresenceStore.d.ts +1 -8
- package/dist/helpers/PresenceStore.d.ts.map +1 -1
- package/dist/helpers/PresenceStore.js +1 -8
- package/dist/helpers/PresenceStore.js.map +1 -1
- package/dist/helpers/SocketHelper.d.ts.map +1 -1
- package/dist/helpers/SocketHelper.js +3 -18
- package/dist/helpers/SocketHelper.js.map +1 -1
- package/dist/helpers/SubscriptionManager.d.ts +1 -8
- package/dist/helpers/SubscriptionManager.d.ts.map +1 -1
- package/dist/helpers/SubscriptionManager.js +3 -22
- package/dist/helpers/SubscriptionManager.js.map +1 -1
- package/dist/helpers/WebPushHelper.d.ts +3 -17
- package/dist/helpers/WebPushHelper.d.ts.map +1 -1
- package/dist/helpers/WebPushHelper.js +3 -17
- package/dist/helpers/WebPushHelper.js.map +1 -1
- package/dist/helpers/createEmotionCache.d.ts.map +1 -1
- package/dist/helpers/createEmotionCache.js +1 -3
- package/dist/helpers/createEmotionCache.js.map +1 -1
- package/dist/hooks/useConversation.d.ts +1 -9
- package/dist/hooks/useConversation.d.ts.map +1 -1
- package/dist/hooks/useConversation.js +4 -12
- package/dist/hooks/useConversation.js.map +1 -1
- package/dist/hooks/useNotifications.d.ts +1 -19
- package/dist/hooks/useNotifications.d.ts.map +1 -1
- package/dist/hooks/useNotifications.js +1 -24
- package/dist/hooks/useNotifications.js.map +1 -1
- package/dist/login/LoginPage.d.ts.map +1 -1
- package/dist/login/LoginPage.js +11 -14
- package/dist/login/LoginPage.js.map +1 -1
- package/dist/login/components/Login.d.ts.map +1 -1
- package/dist/login/components/Login.js +2 -1
- package/dist/login/components/Login.js.map +1 -1
- package/dist/login/components/Register.d.ts.map +1 -1
- package/dist/login/components/Register.js +4 -3
- package/dist/login/components/Register.js.map +1 -1
- package/dist/login/components/SsoButtons.d.ts +3 -0
- package/dist/login/components/SsoButtons.d.ts.map +1 -0
- package/dist/login/components/SsoButtons.js +51 -0
- package/dist/login/components/SsoButtons.js.map +1 -0
- package/dist/login/index.d.ts +1 -0
- package/dist/login/index.d.ts.map +1 -1
- package/dist/login/index.js +1 -0
- package/dist/login/index.js.map +1 -1
- package/dist/markdown/components/htmlEditor/plugins/HtmlToolbarPlugin.d.ts.map +1 -1
- package/dist/markdown/components/htmlEditor/plugins/HtmlToolbarPlugin.js +0 -7
- package/dist/markdown/components/htmlEditor/plugins/HtmlToolbarPlugin.js.map +1 -1
- package/dist/markdown/components/htmlEditor/utils/cleanHtml.d.ts +1 -4
- package/dist/markdown/components/htmlEditor/utils/cleanHtml.d.ts.map +1 -1
- package/dist/markdown/components/htmlEditor/utils/cleanHtml.js +1 -17
- package/dist/markdown/components/htmlEditor/utils/cleanHtml.js.map +1 -1
- package/dist/markdown/components/markdownEditor/MarkdownPreviewLight.d.ts.map +1 -1
- package/dist/markdown/components/markdownEditor/MarkdownPreviewLight.js +5 -10
- package/dist/markdown/components/markdownEditor/MarkdownPreviewLight.js.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/FloatingTextMenu/FloatingTextFormatToolbarPlugin.d.ts.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/FloatingTextMenu/FloatingTextFormatToolbarPlugin.js +4 -11
- package/dist/markdown/components/markdownEditor/plugins/FloatingTextMenu/FloatingTextFormatToolbarPlugin.js.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/ToolbarPlugin.d.ts.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/ToolbarPlugin.js +0 -2
- package/dist/markdown/components/markdownEditor/plugins/ToolbarPlugin.js.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/customLink/FloatingLinkEditor.d.ts.map +1 -1
- package/dist/markdown/components/markdownEditor/plugins/customLink/FloatingLinkEditor.js +1 -3
- package/dist/markdown/components/markdownEditor/plugins/customLink/FloatingLinkEditor.js.map +1 -1
- package/dist/public/locales/en.json +7 -3
- package/dist/website/components/Element.d.ts.map +1 -1
- package/dist/website/components/Element.js +2 -3
- package/dist/website/components/Element.js.map +1 -1
- package/dist/website/components/admin/calendar/CuratedEventCalendar.d.ts.map +1 -1
- package/dist/website/components/admin/calendar/CuratedEventCalendar.js +1 -3
- package/dist/website/components/admin/calendar/CuratedEventCalendar.js.map +1 -1
- package/dist/website/components/elementTypes/CalendarElement.d.ts +1 -5
- package/dist/website/components/elementTypes/CalendarElement.d.ts.map +1 -1
- package/dist/website/components/elementTypes/CalendarElement.js.map +1 -1
- package/dist/website/components/elementTypes/RawHTMLElement.d.ts.map +1 -1
- package/dist/website/components/elementTypes/RawHTMLElement.js +1 -3
- package/dist/website/components/elementTypes/RawHTMLElement.js.map +1 -1
- package/dist/website/components/eventCalendar/EventCalendar.d.ts.map +1 -1
- package/dist/website/components/eventCalendar/EventCalendar.js +1 -3
- package/dist/website/components/eventCalendar/EventCalendar.js.map +1 -1
- package/dist/website/components/groups/GroupCard.d.ts.map +1 -1
- package/dist/website/components/groups/GroupCard.js.map +1 -1
- package/dist/website/components/groups/GroupsBrowser.d.ts +2 -2
- package/dist/website/components/groups/GroupsBrowser.d.ts.map +1 -1
- package/dist/website/components/video/LiveStream.d.ts.map +1 -1
- package/dist/website/components/video/LiveStream.js.map +1 -1
- package/dist/website/helpers/StyleHelper.d.ts.map +1 -1
- package/dist/website/helpers/StyleHelper.js +1 -9
- package/dist/website/helpers/StyleHelper.js.map +1 -1
- package/dist/website/helpers/imageOptimizer.d.ts.map +1 -1
- package/dist/website/helpers/imageOptimizer.js +0 -3
- package/dist/website/helpers/imageOptimizer.js.map +1 -1
- package/dist/website/helpers/interfaces.d.ts +1 -7
- package/dist/website/helpers/interfaces.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageEditor.d.ts","sourceRoot":"","sources":["../../src/components/ImageEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAG3E,OAAO,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ImageEditor.d.ts","sourceRoot":"","sources":["../../src/components/ImageEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAG3E,OAAO,4BAA4B,CAAC;AAIpC,UAAU,KAAK;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,qBAiJvC"}
|
|
@@ -4,14 +4,12 @@ import { useState, useEffect, useRef, Suspense, lazy } from "react";
|
|
|
4
4
|
import { InputBox, SmallButton, Loading } from ".";
|
|
5
5
|
import { Locale } from "../helpers";
|
|
6
6
|
import "cropperjs/dist/cropper.css";
|
|
7
|
-
// Lazy load the Cropper component
|
|
8
7
|
const Cropper = lazy(() => import("react-cropper").then(module => ({ default: module.default })));
|
|
9
8
|
export function ImageEditor(props) {
|
|
10
9
|
const [photoSrc, setPhotoSrc] = useState("");
|
|
11
10
|
const [croppedImageDataUrl, setCroppedImageDataUrl] = useState("");
|
|
12
11
|
const cropperRef = useRef(null);
|
|
13
12
|
const timeoutRef = useRef(null);
|
|
14
|
-
// Cleanup timeout on unmount
|
|
15
13
|
useEffect(() => {
|
|
16
14
|
return () => {
|
|
17
15
|
if (timeoutRef.current !== null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageEditor.js","sourceRoot":"","sources":["../../src/components/ImageEditor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,4BAA4B,CAAC;AAEpC,
|
|
1
|
+
{"version":3,"file":"ImageEditor.js","sourceRoot":"","sources":["../../src/components/ImageEditor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import React, { ReactNode } from "react";
|
|
2
2
|
interface PageHeaderProps {
|
|
3
3
|
icon?: ReactNode;
|
|
4
|
+
avatar?: ReactNode;
|
|
4
5
|
title: string;
|
|
5
6
|
subtitle?: string;
|
|
7
|
+
breadcrumbs?: ReactNode;
|
|
8
|
+
chips?: ReactNode;
|
|
6
9
|
children?: ReactNode;
|
|
7
10
|
statistics?: Array<{
|
|
8
11
|
icon: ReactNode;
|
|
9
12
|
value: string;
|
|
10
13
|
label: string;
|
|
11
14
|
}>;
|
|
15
|
+
tabs?: React.ReactNode;
|
|
12
16
|
}
|
|
13
17
|
export declare const PageHeader: React.FC<PageHeaderProps>;
|
|
14
18
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageHeader.d.ts","sourceRoot":"","sources":["../../src/components/PageHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzC,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"PageHeader.d.ts","sourceRoot":"","sources":["../../src/components/PageHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzC,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtE,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAgJhD,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import { Box, Typography, Stack, Container } from "@mui/material";
|
|
4
|
-
export const PageHeader = ({ icon, title, subtitle, children, statistics }) => {
|
|
4
|
+
export const PageHeader = ({ icon, avatar, title, subtitle, breadcrumbs, chips, children, statistics, tabs }) => {
|
|
5
5
|
return (_jsx(Box, { id: "page-header", sx: {
|
|
6
|
-
|
|
6
|
+
// Vertical gradient so the top edge is uniformly --c1d3 and blends seamlessly with the AppBar above.
|
|
7
|
+
background: "linear-gradient(180deg, var(--c1d3, #0B2C52) 0%, var(--c1, #1565C0) 60%, var(--c1l2, #3B71C9) 100%)",
|
|
7
8
|
color: "#FFF",
|
|
8
9
|
position: "relative",
|
|
9
10
|
left: "50%",
|
|
@@ -20,33 +21,29 @@ export const PageHeader = ({ icon, title, subtitle, children, statistics }) => {
|
|
|
20
21
|
width: 400,
|
|
21
22
|
height: 400,
|
|
22
23
|
borderRadius: "50%",
|
|
23
|
-
background: "rgba(255,255,255,0.05)",
|
|
24
|
-
pointerEvents: "none",
|
|
25
|
-
},
|
|
26
|
-
"&::after": {
|
|
27
|
-
content: "''",
|
|
28
|
-
position: "absolute",
|
|
29
|
-
bottom: -80,
|
|
30
|
-
left: -80,
|
|
31
|
-
width: 300,
|
|
32
|
-
height: 300,
|
|
33
|
-
borderRadius: "50%",
|
|
34
24
|
background: "rgba(255,255,255,0.04)",
|
|
35
|
-
pointerEvents: "none"
|
|
36
|
-
}
|
|
37
|
-
}, children: _jsxs(Container, { maxWidth: "xl", sx: { position: "relative", zIndex: 1,
|
|
38
|
-
? (_jsxs(Stack, { id: "page-header-title-section", direction: "row", spacing: 2, alignItems: "center", sx: { flex: 1 }, children: [
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
25
|
+
pointerEvents: "none"
|
|
26
|
+
}
|
|
27
|
+
}, children: _jsxs(Container, { maxWidth: "xl", sx: { position: "relative", zIndex: 1, pt: 3.5, pb: tabs ? 0 : 3.5 }, children: [breadcrumbs && (_jsx(Box, { id: "page-header-breadcrumbs", sx: { mb: 1.5, fontSize: "12px", color: "rgba(255,255,255,0.8)" }, children: breadcrumbs })), _jsxs(Stack, { direction: { xs: "column", md: "row" }, spacing: { xs: 2, md: 4 }, alignItems: { xs: "flex-start", md: "center" }, sx: { width: "100%" }, children: [(avatar || icon)
|
|
28
|
+
? (_jsxs(Stack, { id: "page-header-title-section", direction: "row", spacing: 2, alignItems: "center", sx: { flex: 1 }, children: [avatar
|
|
29
|
+
? (_jsx(Box, { id: "page-header-avatar", sx: { width: 56, height: 56, display: "flex", alignItems: "center", justifyContent: "center", flexShrink: 0 }, children: avatar }))
|
|
30
|
+
: (_jsx(Box, { id: "page-header-icon", sx: {
|
|
31
|
+
backgroundColor: "rgba(255,255,255,0.2)",
|
|
32
|
+
borderRadius: "12px",
|
|
33
|
+
p: 1.5,
|
|
34
|
+
display: "flex",
|
|
35
|
+
alignItems: "center",
|
|
36
|
+
justifyContent: "center"
|
|
37
|
+
}, children: React.cloneElement(icon, { sx: { fontSize: 32, color: "#FFF" } }) })), _jsxs(Box, { id: "page-header-text", children: [_jsxs(Stack, { direction: "row", spacing: 1, alignItems: "center", children: [_jsx(Typography, { id: "page-header-title", sx: { fontSize: "20px", fontWeight: 650, letterSpacing: "-0.012em", lineHeight: 1.2 }, children: title }), chips && (_jsx(Stack, { id: "page-header-chips", direction: "row", spacing: 1, alignItems: "center", children: chips }))] }), subtitle && (_jsx(Typography, { id: "page-header-subtitle", sx: { fontSize: "12.5px", color: "rgba(255,255,255,0.75)", fontWeight: 400 }, children: subtitle }))] })] }))
|
|
38
|
+
: (_jsxs(Box, { id: "page-header-text", sx: { flex: 1 }, children: [_jsxs(Stack, { direction: "row", spacing: 1, alignItems: "center", children: [_jsx(Typography, { id: "page-header-title", sx: { fontSize: "20px", fontWeight: 650, letterSpacing: "-0.012em", lineHeight: 1.2 }, children: title }), chips && (_jsx(Stack, { id: "page-header-chips", direction: "row", spacing: 1, alignItems: "center", children: chips }))] }), subtitle && (_jsx(Typography, { id: "page-header-subtitle", sx: { fontSize: "12.5px", color: "rgba(255,255,255,0.75)", fontWeight: 400 }, children: subtitle }))] })), children && (_jsx(Stack, { id: "page-header-actions", direction: "row", spacing: 1, sx: {
|
|
47
39
|
flexShrink: 0,
|
|
48
40
|
justifyContent: { xs: "flex-start", md: "flex-end" },
|
|
49
41
|
width: { xs: "100%", md: "auto" }
|
|
50
|
-
}, children: children }))] }), statistics && statistics.length > 0 && (_jsx(
|
|
42
|
+
}, children: children }))] }), statistics && statistics.length > 0 && (_jsx(Box, { id: "page-header-statistics", sx: { display: "flex", flexWrap: "wrap", alignItems: "flex-end", mt: 3 }, children: statistics.map((stat, i) => (_jsxs(Box, { sx: {
|
|
43
|
+
display: "flex",
|
|
44
|
+
flexDirection: "column",
|
|
45
|
+
px: "22px",
|
|
46
|
+
...(i === 0 ? { pl: 0 } : { borderLeft: "1px solid rgba(255,255,255,.22)" })
|
|
47
|
+
}, children: [_jsx(Typography, { sx: { fontSize: "18px", fontWeight: 650, fontVariantNumeric: "tabular-nums", color: "#FFF", lineHeight: 1.25 }, children: stat.value }), _jsx(Typography, { sx: { fontSize: "10.5px", textTransform: "uppercase", letterSpacing: ".07em", color: "rgba(255,255,255,.62)" }, children: stat.label })] }, stat.label))) })), tabs && (_jsx(Box, { id: "page-header-tabs", sx: { mt: 3, width: "100%" }, children: tabs }))] }) }));
|
|
51
48
|
};
|
|
52
49
|
//# sourceMappingURL=PageHeader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageHeader.js","sourceRoot":"","sources":["../../src/components/PageHeader.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"PageHeader.js","sourceRoot":"","sources":["../../src/components/PageHeader.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,7 @@ interface Props {
|
|
|
10
10
|
noWrapper?: boolean;
|
|
11
11
|
showCommentCount?: boolean;
|
|
12
12
|
}
|
|
13
|
-
/**
|
|
14
|
-
* Realtime conversation surface keyed by (contentType, contentId). Hydrates via
|
|
15
|
-
* GET /conversations/messages/{contentType}/{contentId}, joins the matching room
|
|
16
|
-
* via SubscriptionManager, and re-renders on inbound message/deleteMessage events.
|
|
17
|
-
*
|
|
18
|
-
* Replaces the legacy B1App `notes/Conversations.tsx` + `notes/Conversation.tsx` pair.
|
|
19
|
-
*/
|
|
13
|
+
/** Realtime conversation surface for (contentType, contentId). */
|
|
20
14
|
export declare function Conversations(props: Props): React.JSX.Element;
|
|
21
15
|
export {};
|
|
22
16
|
//# sourceMappingURL=Conversations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversations.d.ts","sourceRoot":"","sources":["../../../src/components/conversations/Conversations.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAA2C,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AASpG,UAAU,KAAK;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED
|
|
1
|
+
{"version":3,"file":"Conversations.d.ts","sourceRoot":"","sources":["../../../src/components/conversations/Conversations.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAA2C,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AASpG,UAAU,KAAK;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,qBA8GzC"}
|
|
@@ -9,13 +9,7 @@ import { SubscriptionManager } from "../../helpers/SubscriptionManager";
|
|
|
9
9
|
import { Note } from "../notes/Note";
|
|
10
10
|
import { AddNote } from "../notes/AddNote";
|
|
11
11
|
import { SubscriptionToggle, filterVisibleMessages } from "../notes/SubscriptionToggle";
|
|
12
|
-
/**
|
|
13
|
-
* Realtime conversation surface keyed by (contentType, contentId). Hydrates via
|
|
14
|
-
* GET /conversations/messages/{contentType}/{contentId}, joins the matching room
|
|
15
|
-
* via SubscriptionManager, and re-renders on inbound message/deleteMessage events.
|
|
16
|
-
*
|
|
17
|
-
* Replaces the legacy B1App `notes/Conversations.tsx` + `notes/Conversation.tsx` pair.
|
|
18
|
-
*/
|
|
12
|
+
/** Realtime conversation surface for (contentType, contentId). */
|
|
19
13
|
export function Conversations(props) {
|
|
20
14
|
const canPost = props.canPost !== false;
|
|
21
15
|
const churchId = props.context?.userChurch?.church?.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversations.js","sourceRoot":"","sources":["../../../src/components/conversations/Conversations.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAaxF
|
|
1
|
+
{"version":3,"file":"Conversations.js","sourceRoot":"","sources":["../../../src/components/conversations/Conversations.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteHeader.d.ts","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAG3D,KAAK,KAAK,GAAG;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AAED,eAAO,MAAM,UAAU,oCAAqB,KAAK,
|
|
1
|
+
{"version":3,"file":"SiteHeader.d.ts","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAG3D,KAAK,KAAK,GAAG;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AAED,eAAO,MAAM,UAAU,oCAAqB,KAAK,uBAiL/C,CAAC"}
|
|
@@ -21,7 +21,6 @@ export const SiteHeader = React.memo((props) => {
|
|
|
21
21
|
initializeNotifications();
|
|
22
22
|
}, [props.context?.person?.id, props.context?.userChurch?.church?.id]);
|
|
23
23
|
const refresh = React.useCallback(async () => {
|
|
24
|
-
// Direct access to NotificationService for refresh functionality
|
|
25
24
|
await NotificationService.getInstance().refresh();
|
|
26
25
|
}, []);
|
|
27
26
|
// Memoize userName to prevent recreation
|
|
@@ -63,7 +62,9 @@ export const SiteHeader = React.memo((props) => {
|
|
|
63
62
|
]);
|
|
64
63
|
const CustomAppBar = styled(AppBar)(({ theme }) => ({
|
|
65
64
|
zIndex: theme.zIndex.drawer + 1,
|
|
66
|
-
backgroundColor: "var(--
|
|
65
|
+
backgroundColor: "var(--c1d3, #0B2C52)",
|
|
66
|
+
boxShadow: "none",
|
|
67
|
+
borderBottom: "none",
|
|
67
68
|
transition: theme.transitions.create(["width", "margin"], {
|
|
68
69
|
easing: theme.transitions.easing.sharp,
|
|
69
70
|
duration: theme.transitions.duration.leavingScreen
|
|
@@ -74,12 +75,13 @@ export const SiteHeader = React.memo((props) => {
|
|
|
74
75
|
let result = [];
|
|
75
76
|
if (props.appName === "B1Admin") {
|
|
76
77
|
if (props.primaryMenuLabel === "People") {
|
|
77
|
-
if (props.secondaryMenuLabel === "People")
|
|
78
|
+
if (props.secondaryMenuLabel === "People") {
|
|
78
79
|
result = [
|
|
79
80
|
"docs/b1-admin/people/adding-people",
|
|
80
81
|
"docs/b1-admin/people/searching-people",
|
|
81
82
|
"docs/b1-admin/people/roles-permissions"
|
|
82
83
|
];
|
|
84
|
+
}
|
|
83
85
|
else if (props.secondaryMenuLabel === "Groups")
|
|
84
86
|
result = ["docs/b1-admin/groups/group-members", "docs/b1-admin/groups", "docs/b1-admin/groups/group-calendar"];
|
|
85
87
|
else if (props.secondaryMenuLabel === "Attendance")
|
|
@@ -121,24 +123,22 @@ export const SiteHeader = React.memo((props) => {
|
|
|
121
123
|
"--c1": "#1565C0",
|
|
122
124
|
"--c1d1": "#1358AD",
|
|
123
125
|
"--c1d2": "#114A99",
|
|
126
|
+
"--c1d3": "#0B2C52",
|
|
124
127
|
"--c1l2": "#568BDA",
|
|
125
|
-
backgroundColor: "var(--
|
|
128
|
+
backgroundColor: "var(--c1d3, #0B2C52)",
|
|
126
129
|
color: "#FFF"
|
|
127
|
-
}, children: [_jsx(CustomAppBar, { id: "site-app-bar", position: "absolute", elevation:
|
|
130
|
+
}, children: [_jsx(CustomAppBar, { id: "site-app-bar", position: "absolute", elevation: 0, children: _jsxs(Toolbar, { id: "site-toolbar", sx: { pr: "24px", backgroundColor: "var(--c1d3, #0B2C52)", minHeight: "64px !important" }, children: [_jsx(PrimaryMenu, { label: props.primaryMenuLabel, menuItems: props.primaryMenuItems, onNavigate: props.onNavigate }), _jsx(SecondaryMenu, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }), _jsx("div", { id: "secondary-menu-container", style: { flex: 1 }, children: _jsx(SecondaryMenuAlt, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }) }), props.context?.user?.id && (_jsx(UserMenu, { profilePicture: profilePicture, userName: userName, context: stableContext, appName: props.appName, loadCounts: refresh, notificationCounts: { notificationCount: 0, pmCount: 0 }, onNavigate: props.onNavigate }, "user-menu-stable")), !props.context?.user?.id && _jsx(Link, { id: "login-link", href: "/login", color: "inherit", style: { textDecoration: "none" }, children: "Login" }), _jsx(SupportDrawer, { appName: props.appName, relatedArticles: getRelatedArticles() })] }) }), _jsx("div", { id: "app-bar-spacer", style: { height: "64px" } })] }) }));
|
|
128
131
|
}, (prevProps, nextProps) => {
|
|
129
132
|
// Custom comparison to prevent unnecessary re-renders
|
|
130
|
-
// Check if essential props have changed
|
|
131
133
|
if (prevProps.primaryMenuLabel !== nextProps.primaryMenuLabel ||
|
|
132
134
|
prevProps.secondaryMenuLabel !== nextProps.secondaryMenuLabel ||
|
|
133
135
|
prevProps.appName !== nextProps.appName) {
|
|
134
136
|
return false;
|
|
135
137
|
}
|
|
136
|
-
// Check if menu items arrays have changed (shallow comparison)
|
|
137
138
|
if (prevProps.primaryMenuItems?.length !== nextProps.primaryMenuItems?.length ||
|
|
138
139
|
prevProps.secondaryMenuItems?.length !== nextProps.secondaryMenuItems?.length) {
|
|
139
140
|
return false;
|
|
140
141
|
}
|
|
141
|
-
// Check if user context has actually changed (deep comparison of essential parts)
|
|
142
142
|
const prevUser = prevProps.context?.user;
|
|
143
143
|
const nextUser = nextProps.context?.user;
|
|
144
144
|
if (prevUser?.id !== nextUser?.id ||
|
|
@@ -146,19 +146,15 @@ export const SiteHeader = React.memo((props) => {
|
|
|
146
146
|
prevUser?.lastName !== nextUser?.lastName) {
|
|
147
147
|
return false;
|
|
148
148
|
}
|
|
149
|
-
// Check if person context has changed
|
|
150
149
|
if (prevProps.context?.person?.id !== nextProps.context?.person?.id) {
|
|
151
150
|
return false;
|
|
152
151
|
}
|
|
153
|
-
// Check if church context has changed
|
|
154
152
|
if (prevProps.context?.userChurch?.church?.id !== nextProps.context?.userChurch?.church?.id) {
|
|
155
153
|
return false;
|
|
156
154
|
}
|
|
157
|
-
// Check if onNavigate function reference has changed
|
|
158
155
|
if (prevProps.onNavigate !== nextProps.onNavigate) {
|
|
159
156
|
return false;
|
|
160
157
|
}
|
|
161
|
-
// All essential props are the same, skip re-render
|
|
162
158
|
return true;
|
|
163
159
|
});
|
|
164
160
|
SiteHeader.displayName = "SiteHeader";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteHeader.js","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAYxE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAAW,EAAE,EAAE;IACnD,4FAA4F;IAC5F,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,uBAAuB,GAAG,KAAK,IAAI,EAAE;YACzC,IAAI,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBAClD,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,CAAC;QAEF,uBAAuB,EAAE,CAAC;IAC5B,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAEvE,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QAC3C,
|
|
1
|
+
{"version":3,"file":"SiteHeader.js","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddNote.d.ts","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EAAoB,oBAAoB,EAAc,MAAM,qBAAqB,CAAC;AAczF,KAAK,KAAK,GAAG;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF,wBAAgB,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"AddNote.d.ts","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EAAoB,oBAAoB,EAAc,MAAM,qBAAqB,CAAC;AAczF,KAAK,KAAK,GAAG;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF,wBAAgB,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,qBAiL7D"}
|
|
@@ -44,10 +44,7 @@ export function AddNote({ context, onCancel, ...props }) {
|
|
|
44
44
|
const isNewConversation = !cId;
|
|
45
45
|
if (!cId)
|
|
46
46
|
cId = await props.createConversation();
|
|
47
|
-
//
|
|
48
|
-
// the message so the server's broadcast lands on this tab. Without this, the broadcast
|
|
49
|
-
// queries the connections table at save time and finds nobody — the message is
|
|
50
|
-
// persisted but never echoed live to either the sender or any other open tab.
|
|
47
|
+
// Join room before sending to ensure broadcast reaches this tab.
|
|
51
48
|
if (isNewConversation && churchId && cId) {
|
|
52
49
|
try {
|
|
53
50
|
await SubscriptionManager.joinRoom(cId, churchId, context?.person?.id);
|
|
@@ -57,8 +54,7 @@ export function AddNote({ context, onCancel, ...props }) {
|
|
|
57
54
|
const m = { ...message, conversationId: cId };
|
|
58
55
|
ApiHelper.post("/messages", [m], "MessagingApi")
|
|
59
56
|
.then((saved) => {
|
|
60
|
-
//
|
|
61
|
-
// sender sees it instantly even if the broadcast missed (e.g. join-room race).
|
|
57
|
+
// Apply message locally for instant sender feedback in case broadcast misses.
|
|
62
58
|
const result = Array.isArray(saved) ? saved[0] : saved;
|
|
63
59
|
if (result?.conversationId)
|
|
64
60
|
ConversationStore.applyMessage(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddNote.js","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AddNote.js","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAA0C,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EACL,GAAG,EACH,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,MAAM,EACN,IAAI,EACL,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWjD,MAAM,UAAU,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAS;IAC5D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAoB,CAAC;IAC3D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IACnD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAqB,IAAI,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;IAChE,MAAM,QAAQ,GAAG,UAAU,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,SAAS,CAAC,GAAG,CAAC,aAAa,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,cAAc,CAAC;iBACtE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IAE5C,MAAM,YAAY,GAAG,CAAC,CAAgF,EAAE,EAAE;QACxG,SAAS,CAAC,EAAE,CAAC,CAAC;QACd,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE;YAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,wBAAwB,CAAC,CAAC,CAAC;QAC7G,SAAS,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,KAAK,UAAU,UAAU;QACvB,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO;QAExB,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC;QAC/B,MAAM,iBAAiB,GAAG,CAAC,GAAG,CAAC;QAC/B,IAAI,CAAC,GAAG;YAAE,GAAG,GAAG,MAAM,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAEjD,iEAAiE;QACjE,IAAI,iBAAiB,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;YACzC,IAAI,CAAC;gBAAC,MAAM,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACxG,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC;aAC7C,IAAI,CAAC,CAAC,KAAyB,EAAE,EAAE;YAClC,8EAA8E;YAC9E,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACvD,IAAI,MAAM,EAAE,cAAc;gBAAE,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACnE,KAAK,CAAC,QAAQ,EAAE,CAAC;YACjB,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;YACpB,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,KAAK,EAAE,OAAO,KAAK,WAAW,EAAE,CAAC;gBACnC,SAAS,CAAC,CAAC,4CAA4C,CAAC,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,2CAA2C,CAAC,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,UAAU,UAAU;QACvB,IAAI,CAAC,KAAK,CAAC,SAAS;YAAE,OAAO;QAC7B,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,KAAK,CAAC,SAAS,EAAE,EAAE,cAAc,CAAC,CAAC;QACvE,KAAK,CAAC,QAAQ,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAExD,OAAO,CACL,MAAC,GAAG,IAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aACxB,KAAC,aAAa,IAAC,MAAM,EAAE,MAAM,GAAI,EAEjC,KAAC,KAAK,IAAC,OAAO,EAAC,UAAU,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,YACjF,MAAC,KAAK,IAAC,SAAS,EAAC,KAAK,EAAC,OAAO,EAAE,CAAC,EAAE,UAAU,EAAC,YAAY,aACxD,KAAC,MAAM,IACL,GAAG,EAAE,KAAK,EACV,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EACnC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAC7B,EAEF,MAAC,GAAG,IAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,aAClB,KAAC,SAAS,IACR,SAAS,QACT,SAAS,QACT,IAAI,EAAE,CAAC,EACP,IAAI,EAAC,UAAU,gBACH,UAAU,EACtB,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,EAC3E,OAAO,EAAC,UAAU,EAClB,KAAK,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,EAC7B,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE;wCACV,gBAAgB,EAAE,IAAI;wCACtB,EAAE,EAAE;4CACF,QAAQ,EAAE,MAAM;4CAChB,YAAY,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE;yCACxD;qCACF,EACD,EAAE,EAAE;wCACF,OAAO,EAAE,OAAO;wCAChB,YAAY,EAAE,CAAC;wCACf,CAAC,EAAE,CAAC;wCACJ,MAAM,EAAE,WAAW;wCACnB,WAAW,EAAE,UAAU;wCACvB,SAAS,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;wCACtC,eAAe,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE;qCACjD,GACD,EAEF,MAAC,GAAG,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,aACtD,KAAK,CAAC,SAAS,IAAI,CAClB,KAAC,UAAU,IACT,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,GAAG,EAAE;gDACZ,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;gDACxC,QAAQ,EAAE,EAAE,CAAC;4CACf,CAAC,EACD,QAAQ,EAAE,YAAY,EACtB,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,YAEzB,KAAC,IAAI,IAAC,QAAQ,EAAC,OAAO,uBAAc,GACzB,CACd,EAED,KAAC,GAAG,IAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAI,EACxB,MAAC,GAAG,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,aACpC,KAAC,UAAU,IACT,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC,EACjD,QAAQ,EAAE,YAAY,EACtB,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,YAEzB,KAAC,IAAI,IAAC,QAAQ,EAAC,OAAO,wCAA+B,GAC1C,EACZ,cAAc,IAAI,CACjB,KAAC,UAAU,IACT,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,cAAc,EACvB,QAAQ,EAAE,YAAY,EACtB,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,YAE3B,KAAC,IAAI,IAAC,QAAQ,EAAC,OAAO,uBAAc,GACzB,CACd,EAED,KAAC,UAAU,IACT,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,SAAS,EACf,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,YAAY,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EACnD,EAAE,EAAE;wDACF,OAAO,EAAE,cAAc;wDACvB,KAAK,EAAE,OAAO;wDACd,SAAS,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE;wDACtC,YAAY,EAAE,EAAE,OAAO,EAAE,2BAA2B,EAAE,KAAK,EAAE,iBAAiB,EAAE;qDACjF,YAEA,YAAY,CAAC,CAAC,CAAC,KAAC,gBAAgB,IAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAC,SAAS,GAAG,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,QAAQ,EAAC,OAAO,qBAAY,GACxF,IACT,IACF,IACF,IACA,GACF,EACR,KAAC,WAAW,IACV,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,EACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAC1F,IACE,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notes.d.ts","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,EAA2C,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGpG,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"Notes.d.ts","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,EAA2C,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGpG,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,qBAuNjC"}
|
|
@@ -14,7 +14,6 @@ export function Notes(props) {
|
|
|
14
14
|
const [previousMessageCount, setPreviousMessageCount] = React.useState(0);
|
|
15
15
|
const churchId = props.context?.userChurch?.church?.id;
|
|
16
16
|
const personId = props.context?.person?.id;
|
|
17
|
-
// Add CSS for custom scrollbar styling
|
|
18
17
|
React.useEffect(() => {
|
|
19
18
|
const styleId = "notes-scrollbar-styles";
|
|
20
19
|
if (!document.getElementById(styleId)) {
|
|
@@ -51,7 +50,6 @@ export function Notes(props) {
|
|
|
51
50
|
document.head.appendChild(style);
|
|
52
51
|
}
|
|
53
52
|
}, []);
|
|
54
|
-
// Hydrate via ConversationStore + subscribe + join the realtime room.
|
|
55
53
|
React.useEffect(() => {
|
|
56
54
|
let cancelled = false;
|
|
57
55
|
let unsubscribe = null;
|
|
@@ -91,7 +89,7 @@ export function Notes(props) {
|
|
|
91
89
|
if (joined && churchId)
|
|
92
90
|
SubscriptionManager.leaveRoom(conversationId, churchId).catch(() => { });
|
|
93
91
|
};
|
|
94
|
-
}, [props.conversationId, props.refreshKey, churchId, personId]);
|
|
92
|
+
}, [props.conversationId, props.refreshKey, churchId, personId]);
|
|
95
93
|
const visibleMessages = React.useMemo(() => filterVisibleMessages(messages), [messages]);
|
|
96
94
|
const subscriptionToggle = (_jsx(SubscriptionToggle, { conversationId: props.conversationId, messages: messages, personId: personId }));
|
|
97
95
|
const getNotes = () => {
|
|
@@ -139,9 +137,7 @@ export function Notes(props) {
|
|
|
139
137
|
}
|
|
140
138
|
}, [visibleMessages, props.maxHeight, isInitialLoad, previousMessageCount]);
|
|
141
139
|
const onLocalUpdate = () => {
|
|
142
|
-
//
|
|
143
|
-
// (e.g. a self-post that the server still echoed back). The store applies the broadcast
|
|
144
|
-
// for us, so we just clear edit mode.
|
|
140
|
+
// Fallback when socket doesn't deliver; store applies broadcast, just clear edit mode.
|
|
145
141
|
setEditMessageId(null);
|
|
146
142
|
};
|
|
147
143
|
const result = props.maxHeight ? (_jsxs("div", { style: {
|
|
@@ -166,8 +162,7 @@ export function Notes(props) {
|
|
|
166
162
|
}, children: _jsx(AddNote, { context: props.context, conversationId: props.conversationId, onUpdate: onLocalUpdate, createConversation: props.createConversation, messageId: editMessageId, onCancel: () => setEditMessageId(null) }) }))] })) : (_jsxs(_Fragment, { children: [getNotesWrapper(), messages && (_jsx(AddNote, { context: props.context, conversationId: props.conversationId, onUpdate: onLocalUpdate, createConversation: props.createConversation, messageId: editMessageId, onCancel: () => setEditMessageId(null) }))] }));
|
|
167
163
|
if (props.noDisplayBox)
|
|
168
164
|
return result;
|
|
169
|
-
|
|
170
|
-
return (_jsx(DisplayBox, { id: "notesBox", "data-testid": "notes-box", headerIcon: "sticky_note_2", headerText: Locale.label("notes.notes", "Notes"), editContent: subscriptionToggle, children: result }));
|
|
165
|
+
return (_jsx(DisplayBox, { id: "notesBox", "data-testid": "notes-box", headerIcon: "sticky_note_2", headerText: Locale.label("notes.notes", "Notes"), editContent: subscriptionToggle, children: result }));
|
|
171
166
|
}
|
|
172
167
|
;
|
|
173
168
|
//# sourceMappingURL=Notes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAWjF,MAAM,UAAU,KAAK,CAAC,KAAY;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;IAE3C,
|
|
1
|
+
{"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,10 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import type { MessageInterface } from "@churchapps/helpers";
|
|
3
|
-
/**
|
|
4
|
-
* Subscription markers piggyback on the messages table — messageType="subscription"
|
|
5
|
-
* rows toggle whether the poster wants notifications for new content. They never
|
|
6
|
-
* render in the visible thread; the server reads them in NotificationHelper to
|
|
7
|
-
* decide who gets the bell / push.
|
|
8
|
-
*/
|
|
3
|
+
/** Subscription markers toggle notifications per person; never render in visible thread */
|
|
9
4
|
export declare const SUBSCRIPTION_MESSAGE_TYPE = "subscription";
|
|
10
5
|
/** Strip subscription markers from a message list before display. */
|
|
11
6
|
export declare function filterVisibleMessages(messages: MessageInterface[] | null | undefined): MessageInterface[];
|
|
12
|
-
/**
|
|
13
|
-
* Walks all messages chronologically; the latest action by `personId` wins.
|
|
14
|
-
* - real comment → subscribed
|
|
15
|
-
* - "subscription" with content="off" → muted
|
|
16
|
-
* - "subscription" with content="on" (or any non-"off") → subscribed
|
|
17
|
-
*/
|
|
7
|
+
/** Compute subscription state: latest action by personId wins (real comment=subscribed, "subscription"/"off"=muted, else=subscribed) */
|
|
18
8
|
export declare function computeSubscriptionState(messages: MessageInterface[] | null | undefined, personId: string | undefined): boolean;
|
|
19
9
|
interface Props {
|
|
20
10
|
conversationId: string | undefined;
|
|
@@ -26,13 +16,7 @@ interface Props {
|
|
|
26
16
|
/** Override the muted color. */
|
|
27
17
|
mutedColor?: string;
|
|
28
18
|
}
|
|
29
|
-
/**
|
|
30
|
-
* Bell icon that shows whether the current user is subscribed to notifications for
|
|
31
|
-
* this conversation. Clicking flips the state by posting a marker message.
|
|
32
|
-
*
|
|
33
|
-
* Renders nothing if conversationId or personId is missing — the toggle is only
|
|
34
|
-
* meaningful once both are known.
|
|
35
|
-
*/
|
|
19
|
+
/** Bell icon toggling notification subscription for this conversation; renders nothing if conversationId or personId missing */
|
|
36
20
|
export declare const SubscriptionToggle: React.FC<Props>;
|
|
37
21
|
export {};
|
|
38
22
|
//# sourceMappingURL=SubscriptionToggle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionToggle.d.ts","sourceRoot":"","sources":["../../../src/components/notes/SubscriptionToggle.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D
|
|
1
|
+
{"version":3,"file":"SubscriptionToggle.d.ts","sourceRoot":"","sources":["../../../src/components/notes/SubscriptionToggle.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,2FAA2F;AAC3F,eAAO,MAAM,yBAAyB,iBAAiB,CAAC;AAExD,qEAAqE;AACrE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,gBAAgB,EAAE,CAGzG;AAED,wIAAwI;AACxI,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAc/H;AAED,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IAChD,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,gIAAgI;AAChI,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6C9C,CAAC"}
|