refactor toasts

This commit is contained in:
Tom
2023-06-07 21:24:17 +02:00
parent 37d49668e4
commit 4ae1eb5e19
14 changed files with 66 additions and 67 deletions
Regular → Executable
+2 -3
View File
@@ -46,6 +46,7 @@ const All = () => {
const account = useAccount();
const navigate = useNavigate();
const setErrorMessage = useError();
const threadMenuRefs = useRef({});
const replyMenuRefs = useRef({});
@@ -57,13 +58,11 @@ const All = () => {
const [prevScrollPos, setPrevScrollPos] = useState(0);
const [visible, setVisible] = useState(true);
const [rotatedStates, setRotatedStates] = useState({});
const [errorMessage, setErrorMessage] = useState(null);
const [isImageSearchOpen, setIsImageSearchOpen] = useState(false);
const [outOfViewCid, setOutOfViewCid] = useState(null);
const [outOfViewPosition, setOutOfViewPosition] = useState({top: 0, left: 0});
const [postOnHoverHeight, setPostOnHoverHeight] = useState(0);
useError(errorMessage, [errorMessage]);
const addresses = defaultSubplebbits.map(subplebbit => subplebbit.address);
const { feed, hasMore, loadMore } = useFeed({subplebbitAddresses: addresses, sortType: 'new'});
@@ -89,7 +88,7 @@ const All = () => {
if (errorString) {
setErrorMessage(errorString)
}
}, [errorString])
}, [errorString, setErrorMessage])
useEffect(() => {
+1 -4
View File
@@ -14,7 +14,6 @@ import OfflineIndicator from '../OfflineIndicator';
import SettingsModal from '../modals/SettingsModal';
import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
import handleStyleChange from '../../utils/handleStyleChange';
import useError from '../../hooks/useError';
import useFeedStateString from '../../hooks/useFeedStateString';
import packageJson from '../../../package.json'
const {version} = packageJson
@@ -31,6 +30,7 @@ const AllCatalog = () => {
} = useGeneralStore(state => state);
const navigate = useNavigate();
const [prevScrollPos, setPrevScrollPos] = useState(0);
const [visible, setVisible] = useState(true);
const addresses = defaultSubplebbits.map(subplebbit => subplebbit.address);
@@ -40,9 +40,6 @@ const AllCatalog = () => {
const stateString = useFeedStateString(subplebbits);
const [errorMessage] = useState(null);
useError(errorMessage, [errorMessage]);
// mobile navbar scroll effect
useEffect(() => {
const debouncedHandleScroll = debounce(() => {
Regular → Executable
+6 -7
View File
@@ -68,6 +68,9 @@ const Board = () => {
const account = useAccount();
const navigate = useNavigate();
const { subplebbitAddress } = useParams();
const setErrorMessage = useError();
const setSuccessMessage = useSuccess();
const nameRef = useRef();
const subjectRef = useRef();
@@ -103,11 +106,6 @@ const Board = () => {
const [outOfViewPosition, setOutOfViewPosition] = useState({top: 0, left: 0});
const [postOnHoverHeight, setPostOnHoverHeight] = useState(0);
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
useEffect(() => {
if (subplebbit.roles !== undefined) {
@@ -162,7 +160,7 @@ const Board = () => {
if (errorString) {
setErrorMessage(errorString);
}
}, [errorString]);
}, [errorString, setErrorMessage]);
const flattenedRepliesByThread = useMemo(() => {
@@ -358,6 +356,7 @@ const Board = () => {
await publishComment();
resetFields();
})();
setTriggerPublishComment(false);
}
}, [publishCommentOptions, triggerPublishComment, publishComment, resetFields]);
@@ -415,7 +414,7 @@ const Board = () => {
if (error) {
setErrorMessage(error);
}
}, [error]);
}, [error, setErrorMessage]);
const handleAuthorDeleteClick = (commentCid) => {
Regular → Executable
+5 -6
View File
@@ -60,10 +60,8 @@ const Catalog = () => {
const navigate = useNavigate();
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
const setErrorMessage = useError();
const setSuccessMessage = useSuccess();
const [triggerPublishComment, setTriggerPublishComment] = useState(false);
const [prevScrollPos, setPrevScrollPos] = useState(0);
@@ -145,7 +143,7 @@ const Catalog = () => {
if (errorString) {
setErrorMessage(errorString);
}
}, [errorString]);
}, [errorString, setErrorMessage]);
const { subscribed, subscribe, unsubscribe } = useSubscribe({subplebbitAddress: selectedAddress});
@@ -283,6 +281,7 @@ const Catalog = () => {
await publishComment();
resetFields();
})();
setTriggerPublishComment(false);
}
}, [publishCommentOptions, triggerPublishComment, publishComment, resetFields]);
@@ -340,7 +339,7 @@ const Catalog = () => {
if (error) {
setErrorMessage(error);
}
}, [error]);
}, [error, setErrorMessage]);
const handleAuthorDeleteClick = (commentCid) => {
Regular → Executable
+2 -4
View File
@@ -34,6 +34,7 @@ const Pending = () => {
const account = useAccount();
const comment = useAccountComment({commentIndex: index});
const setErrorMessage = useError();
useEffect(() => {
setSelectedAddress(comment?.subplebbitAddress);
@@ -55,13 +56,10 @@ const Pending = () => {
if (errorString) {
setErrorMessage(errorString);
}
}, [errorString]);
}, [errorString, setErrorMessage]);
const [visible] = useState(true);
const [errorMessage, setErrorMessage] = useState(null);
useError(errorMessage, [errorMessage]);
const navigate = useNavigate();
const [commentMediaInfo, setCommentMediaInfo] = useState(null);
const fallbackImgUrl = "assets/filedeleted-res.gif";
+3 -4
View File
@@ -46,6 +46,8 @@ const Subscriptions = () => {
const account = useAccount();
const navigate = useNavigate();
const setErrorMessage = useError();
const threadMenuRefs = useRef({});
const replyMenuRefs = useRef({});
@@ -62,9 +64,6 @@ const Subscriptions = () => {
const [outOfViewPosition, setOutOfViewPosition] = useState({top: 0, left: 0});
const [postOnHoverHeight, setPostOnHoverHeight] = useState(0);
const [errorMessage, setErrorMessage] = useState(null);
useError(errorMessage, [errorMessage]);
const { feed, hasMore, loadMore } = useFeed({subplebbitAddresses: account?.subscriptions, sortType: 'new'});
const [selectedFeed, setSelectedFeed] = useState(feed.sort((a, b) => b.timestamp - a.timestamp));
const {subplebbits} = useSubplebbits({subplebbitAddresses: account?.subscriptions, sortType: 'new'});
@@ -88,7 +87,7 @@ const Subscriptions = () => {
if (errorString) {
setErrorMessage(errorString)
}
}, [errorString])
}, [errorString, setErrorMessage])
useEffect(() => {
+1 -5
View File
@@ -14,7 +14,6 @@ import OfflineIndicator from '../OfflineIndicator';
import SettingsModal from '../modals/SettingsModal';
import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
import handleStyleChange from '../../utils/handleStyleChange';
import useError from '../../hooks/useError';
import useFeedStateString from '../../hooks/useFeedStateString';
import packageJson from '../../../package.json'
const {version} = packageJson
@@ -31,8 +30,8 @@ const SubscriptionsCatalog = () => {
} = useGeneralStore(state => state);
const account = useAccount();
const navigate = useNavigate();
const [prevScrollPos, setPrevScrollPos] = useState(0);
const [visible, setVisible] = useState(true);
const { feed, hasMore, loadMore } = useFeed({subplebbitAddresses: account?.subscriptions, sortType: 'new'});
@@ -41,9 +40,6 @@ const SubscriptionsCatalog = () => {
const stateString = useFeedStateString(subplebbits);
const [errorMessage] = useState(null);
useError(errorMessage, [errorMessage]);
// mobile navbar scroll effect
useEffect(() => {
const debouncedHandleScroll = debounce(() => {
Regular → Executable
+5 -6
View File
@@ -68,6 +68,9 @@ const Thread = () => {
const navigate = useNavigate();
const handleClickForm = useClickForm();
const setErrorMessage = useError();
const setSuccessMessage = useSuccess();
const nameRef = useRef();
const commentRef = useRef();
const linkRef = useRef();
@@ -82,8 +85,6 @@ const Thread = () => {
const [triggerPublishComment, setTriggerPublishComment] = useState(false);
const [triggerPublishCommentEdit, setTriggerPublishCommentEdit] = useState(false);
const [deletePost, setDeletePost] = useState(false);
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
const [isReplyOpen, setIsReplyOpen] = useState(false);
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
const [originalCommentContent, setOriginalCommentContent] = useState(null);
@@ -98,8 +99,6 @@ const Thread = () => {
const [outOfViewPosition, setOutOfViewPosition] = useState({top: 0, left: 0});
const [postOnHoverHeight, setPostOnHoverHeight] = useState(0);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
const comment = useComment({commentCid: selectedThread});
const { subplebbitAddress, threadCid } = useParams();
@@ -175,7 +174,7 @@ const Thread = () => {
if (errorString) {
setErrorMessage(errorString);
}
}, [errorString]);
}, [errorString, setErrorMessage]);
const flattenedReplies = useMemo(() =>
@@ -388,7 +387,7 @@ const Thread = () => {
if (error) {
setErrorMessage(error);
}
}, [error]);
}, [error, setErrorMessage]);
const handleAuthorDeleteClick = (commentCid) => {