mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +03:00
Merge branch 'releases/0.29.3' into develop
This commit is contained in:
@@ -275,6 +275,7 @@ export const SidebarListFilter: React.FC<{
|
|||||||
postSelected?: React.ReactNode;
|
postSelected?: React.ReactNode;
|
||||||
preCandidates?: React.ReactNode;
|
preCandidates?: React.ReactNode;
|
||||||
postCandidates?: React.ReactNode;
|
postCandidates?: React.ReactNode;
|
||||||
|
onOpen?: () => void;
|
||||||
// used to store open/closed state in SidebarStateContext
|
// used to store open/closed state in SidebarStateContext
|
||||||
sectionID?: string;
|
sectionID?: string;
|
||||||
}> = ({
|
}> = ({
|
||||||
@@ -292,6 +293,7 @@ export const SidebarListFilter: React.FC<{
|
|||||||
postCandidates,
|
postCandidates,
|
||||||
preSelected,
|
preSelected,
|
||||||
postSelected,
|
postSelected,
|
||||||
|
onOpen,
|
||||||
sectionID,
|
sectionID,
|
||||||
}) => {
|
}) => {
|
||||||
// TODO - sort items?
|
// TODO - sort items?
|
||||||
@@ -344,6 +346,7 @@ export const SidebarListFilter: React.FC<{
|
|||||||
{postSelected ? <div className="extra">{postSelected}</div> : null}
|
{postSelected ? <div className="extra">{postSelected}</div> : null}
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
|
onOpen={onOpen}
|
||||||
>
|
>
|
||||||
{preCandidates ? <div className="extra">{preCandidates}</div> : null}
|
{preCandidates ? <div className="extra">{preCandidates}</div> : null}
|
||||||
<CandidateList
|
<CandidateList
|
||||||
|
|||||||
@@ -76,10 +76,18 @@ export const SidebarSection: React.FC<
|
|||||||
text: React.ReactNode;
|
text: React.ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
outsideCollapse?: React.ReactNode;
|
outsideCollapse?: React.ReactNode;
|
||||||
|
onOpen?: () => void;
|
||||||
// used to store open/closed state in SidebarStateContext
|
// used to store open/closed state in SidebarStateContext
|
||||||
sectionID?: string;
|
sectionID?: string;
|
||||||
}>
|
}>
|
||||||
> = ({ className = "", text, outsideCollapse, sectionID = "", children }) => {
|
> = ({
|
||||||
|
className = "",
|
||||||
|
text,
|
||||||
|
outsideCollapse,
|
||||||
|
onOpen,
|
||||||
|
sectionID = "",
|
||||||
|
children,
|
||||||
|
}) => {
|
||||||
// this is optional
|
// this is optional
|
||||||
const contextState = React.useContext(SidebarStateContext);
|
const contextState = React.useContext(SidebarStateContext);
|
||||||
const openState =
|
const openState =
|
||||||
@@ -93,6 +101,12 @@ export const SidebarSection: React.FC<
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (openState && onOpen) {
|
||||||
|
onOpen();
|
||||||
|
}
|
||||||
|
}, [openState, onOpen]);
|
||||||
|
|
||||||
const collapseProps: Partial<CollapseProps> = {
|
const collapseProps: Partial<CollapseProps> = {
|
||||||
mountOnEnter: true,
|
mountOnEnter: true,
|
||||||
unmountOnExit: true,
|
unmountOnExit: true,
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
* Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
|
* Include IP address in login errors in log. ([#5760](https://github.com/stashapp/stash/pull/5760))
|
||||||
|
|
||||||
### 🐛 Bug fixes
|
### 🐛 Bug fixes
|
||||||
|
* **[0.29.3]** Fixed sidebar filter contents not loading. ([#6240](https://github.com/stashapp/stash/pull/6240))
|
||||||
* **[0.29.2]** Fixed Play Random not playing from the current filtered scenes on scene list sub-pages. ([#6202](https://github.com/stashapp/stash/pull/6202))
|
* **[0.29.2]** Fixed Play Random not playing from the current filtered scenes on scene list sub-pages. ([#6202](https://github.com/stashapp/stash/pull/6202))
|
||||||
* **[0.29.2]** Fixed infinite loop in Group Sub-Groups panel. ([#6212](https://github.com/stashapp/stash/pull/6212))
|
* **[0.29.2]** Fixed infinite loop in Group Sub-Groups panel. ([#6212](https://github.com/stashapp/stash/pull/6212))
|
||||||
* **[0.29.2]** Page no longer scrolls when selecting criterion for the first time in the Edit Filter dialog. ([#6205](https://github.com/stashapp/stash/pull/6205))
|
* **[0.29.2]** Page no longer scrolls when selecting criterion for the first time in the Edit Filter dialog. ([#6205](https://github.com/stashapp/stash/pull/6205))
|
||||||
|
|||||||
Reference in New Issue
Block a user