Mirrors/phanpy
1
0
Fork 0
mirror of https://github.com/cheeaun/phanpy.git synced 2025-03-23 14:13:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle cases when statusID is not used

Browse source
This commit is contained in:
Lim Chee Aun 2023-05-20 01:06:16 +08:00
parent f368071fcb
commit 0df21af374
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/status.jsx
View file

@ -105,10 +105,11 @@ function Status({
const { instance: currentInstance } = api(); const { instance: currentInstance } = api();
const sameInstance = instance === currentInstance; const sameInstance = instance === currentInstance;
const sKey = statusKey(statusID, instance); let sKey = statusKey(statusID, instance);
const snapStates = useSnapshot(states); const snapStates = useSnapshot(states);
if (!status) { if (!status) {
status = snapStates.statuses[sKey] || snapStates.statuses[statusID]; status = snapStates.statuses[sKey] || snapStates.statuses[statusID];
sKey = statusKey(status?.id, instance);
} }
if (!status) { if (!status) {
return null; return null;
@ -977,6 +978,7 @@ function Status({
(result) => { (result) => {
if (!result) return; if (!result) return;
a.removeAttribute('target'); a.removeAttribute('target');
if (!sKey) return;
if (!Array.isArray(states.statusQuotes[sKey])) { if (!Array.isArray(states.statusQuotes[sKey])) {
states.statusQuotes[sKey] = []; states.statusQuotes[sKey] = [];
} }
@ -1954,6 +1956,7 @@ function FilteredStatus({ status, filterInfo, instance, containerProps = {} }) {
} }
const QuoteStatuses = memo(({ id, instance, level = 0 }) => { const QuoteStatuses = memo(({ id, instance, level = 0 }) => {
if (!id || !instance) return;
const snapStates = useSnapshot(states); const snapStates = useSnapshot(states);
const sKey = statusKey(id, instance); const sKey = statusKey(id, instance);
const quotes = snapStates.statusQuotes[sKey]; const quotes = snapStates.statusQuotes[sKey];

1
src/utils/states.js
View file

@ -110,6 +110,7 @@ export function hideAllModals() {
} }
export function statusKey(id, instance) { export function statusKey(id, instance) {
if (!id) return;
return instance ? `${instance}/${id}` : id; return instance ? `${instance}/${id}` : id;
} }