From 3ec2349dce90b600fcfb829bf222155ab4e3f10e Mon Sep 17 00:00:00 2001 From: Shane Israel Date: Mon, 29 Jun 2026 09:10:58 -0600 Subject: [PATCH] more mobile resizing fixes --- app/client/package-lock.json | 2 +- app/client/package.json | 2 +- app/client/src/components/cards/VideoCards.js | 28 +------------------ app/client/src/views/ImageFeed.js | 18 +++++++++--- 4 files changed, 17 insertions(+), 33 deletions(-) diff --git a/app/client/package-lock.json b/app/client/package-lock.json index ebd6665a..dffc7783 100644 --- a/app/client/package-lock.json +++ b/app/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "fireshare", - "version": "1.7.2", + "version": "1.7.3", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/app/client/package.json b/app/client/package.json index f3927dc6..81c900f2 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -1,6 +1,6 @@ { "name": "fireshare", - "version": "1.7.2", + "version": "1.7.3", "private": true, "dependencies": { "@emotion/react": "^11.9.0", diff --git a/app/client/src/components/cards/VideoCards.js b/app/client/src/components/cards/VideoCards.js index dcbd3830..fe3c8963 100644 --- a/app/client/src/components/cards/VideoCards.js +++ b/app/client/src/components/cards/VideoCards.js @@ -26,9 +26,7 @@ const VideoCards = ({ const [videoModal, setVideoModal] = React.useState({ open: false, }) - const [isSingleColumn, setIsSingleColumn] = React.useState(false) const [visibleCount, setVisibleCount] = React.useState(PAGE_SIZE) - const containerRef = React.useRef() const sentinelRef = React.useRef() React.useEffect(() => { @@ -75,26 +73,6 @@ const VideoCards = ({ setVideos((vs) => vs.filter((v) => v.video_id !== id)) } - React.useEffect(() => { - if (!vids || vids.length === 0) { - setIsSingleColumn(false) - return - } - - const el = containerRef.current - if (!el) return - - const observer = new ResizeObserver(([entry]) => { - const width = entry?.contentRect?.width || 0 - if (!width) return - const single = width < size * 2 + 24 - setIsSingleColumn(single) - }) - - observer.observe(el) - return () => observer.disconnect() - }, [size, vids]) - React.useEffect(() => { const sentinel = sentinelRef.current if (!sentinel) return @@ -191,14 +169,10 @@ const VideoCards = ({ {vids && vids.length !== 0 && ( <> diff --git a/app/client/src/views/ImageFeed.js b/app/client/src/views/ImageFeed.js index 0f806575..3902d573 100644 --- a/app/client/src/views/ImageFeed.js +++ b/app/client/src/views/ImageFeed.js @@ -17,6 +17,8 @@ import EditIcon from '@mui/icons-material/Edit' import CheckIcon from '@mui/icons-material/Check' import DeleteIcon from '@mui/icons-material/Delete' import CasinoIcon from '@mui/icons-material/Casino' +import DoneAllIcon from '@mui/icons-material/DoneAll' +import RemoveDoneIcon from '@mui/icons-material/RemoveDone' import Select from 'react-select' import ImageCards from '../components/cards/ImageCards' import EditImageModal from '../components/modal/EditImageModal' @@ -301,7 +303,7 @@ const ImageFeed = ({ authenticated, searchText, cardSize, selectedImageFolder, o {toolbarTarget && ReactDOM.createPortal( - + {!(editMode && isMdDown) && ( {showFolderDropdown && imageFolderList.length > 1 && ( @@ -353,9 +355,17 @@ const ImageFeed = ({ authenticated, searchText, cardSize, selectedImageFolder, o {authenticated && ( {editMode && ( - - - {allSelected ? 'Select None' : 'Select All'} + + : + ) : undefined + } + title={allSelected ? 'Select None' : 'Select All'} + > + {!isMdDown ? (allSelected ? 'Select None' : 'Select All') : null} }