@churchapps/apphelper 1.8.15 → 1.8.16
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.
|
@@ -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,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,
|
|
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,CAkD9C,CAAC"}
|
|
@@ -33,7 +33,11 @@ export function computeSubscriptionState(messages, personId) {
|
|
|
33
33
|
}
|
|
34
34
|
/** Bell icon toggling notification subscription for this conversation; renders nothing if conversationId or personId missing */
|
|
35
35
|
export const SubscriptionToggle = ({ conversationId, messages, personId, size = "small", color, mutedColor }) => {
|
|
36
|
-
const
|
|
36
|
+
const computed = React.useMemo(() => computeSubscriptionState(messages, personId), [messages, personId]);
|
|
37
|
+
// Parents don't reload messages after a toggle, so remember the posted state until they do.
|
|
38
|
+
const [override, setOverride] = React.useState(null);
|
|
39
|
+
React.useEffect(() => { setOverride(null); }, [computed, personId, conversationId]);
|
|
40
|
+
const subscribed = override ?? computed;
|
|
37
41
|
const [busy, setBusy] = React.useState(false);
|
|
38
42
|
const onToggle = async () => {
|
|
39
43
|
if (!conversationId || !personId || busy)
|
|
@@ -42,6 +46,7 @@ export const SubscriptionToggle = ({ conversationId, messages, personId, size =
|
|
|
42
46
|
const next = subscribed ? "off" : "on";
|
|
43
47
|
try {
|
|
44
48
|
await ApiHelper.post("/messages", [{ conversationId, messageType: SUBSCRIPTION_MESSAGE_TYPE, content: next }], "MessagingApi");
|
|
49
|
+
setOverride(next === "on");
|
|
45
50
|
}
|
|
46
51
|
catch (err) {
|
|
47
52
|
console.warn("SubscriptionToggle.toggle failed:", err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionToggle.js","sourceRoot":"","sources":["../../../src/components/notes/SubscriptionToggle.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGlD,2FAA2F;AAC3F,MAAM,CAAC,MAAM,yBAAyB,GAAG,cAAc,CAAC;AAExD,qEAAqE;AACrE,MAAM,UAAU,qBAAqB,CAAC,QAA+C;IACnF,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IACzB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,yBAAyB,CAAC,CAAC;AAC7E,CAAC;AAED,wIAAwI;AACxI,MAAM,UAAU,wBAAwB,CAAC,QAA+C,EAAE,QAA4B;IACpH,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IACzC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QACtC,IAAI,CAAC,CAAC,WAAW,KAAK,yBAAyB;YAAE,UAAU,GAAG,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;;YAC7E,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAaD,gIAAgI;AAChI,MAAM,CAAC,MAAM,kBAAkB,GAAoB,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;IAC/H,MAAM,
|
|
1
|
+
{"version":3,"file":"SubscriptionToggle.js","sourceRoot":"","sources":["../../../src/components/notes/SubscriptionToggle.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.16",
|
|
4
4
|
"description": "Library of helper functions, components, and feature modules (donations/forms/login/markdown/website) for React and NextJS ChurchApps",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|