Merge stable into release

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.137.0] - Not released
+
 ## [1.136.0] - 2024-11-08
 ### Changed
 - The advanced search form is refactored to support the new search operators.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactive-pepyatka",
-  "version": "1.136.0",
+  "version": "1.137.0",
   "description": "",
   "main": "index.js",
   "dependencies": {

src/components/footer.jsx

@@ -7,7 +7,7 @@ export default function Footer({ short }) {
   return (
     <footer className="footer">
       <p role="navigation">
-        &copy; FreeFeed 1.136.0 (Nov 8, 2024)
+        &copy; FreeFeed 1.137.0 (Not released)
         <br />
         <Link to="/about">About</Link>
         {' | '}

src/components/uploader/uploader.js

@@ -79,7 +79,7 @@ export function useUploader({
 
   const doUploadFile = useCallback(
     (file) => {
-      if (fileIds.length >= maxCount) {
+      if (fileIds.length + unfinishedFiles.size >= maxCount) {
         // No more files accepting
         return;
       }
@@ -123,7 +123,8 @@ export function useUploader({
       ...initialFileIds,
       ...[...uploadIds]
         .filter((id) => statuses[id]?.success)
-        .map((id) => allUploads[id].attachment.id),
+        .map((id) => allUploads[id]?.attachment.id)
+        .filter(Boolean),
     ];
 
     // Detect successful uploads
@@ -166,8 +167,8 @@ export function useUploader({
   const clearUploads = useCallback(() => {
     uploadIds.clear();
     unfinishedFiles.clear();
-    setFileIdsLocally(initialFileIds);
-  }, [initialFileIds, setFileIdsLocally, unfinishedFiles, uploadIds]);
+    setFileIdsLocally(givenFileIds);
+  }, [givenFileIds, setFileIdsLocally, unfinishedFiles, uploadIds]);
 
   return {
     isUploading,