Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull companion area styling up #3835

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Pull companion area styling up #3835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04cf98a
Pull companion area styling up
cbeer Dec 4, 2023
bb44477
Restore minWidth styling for left companion windows; fixes #3844
cbeer Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 25 additions & 31 deletions src/components/CompanionArea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,29 @@ import CompanionWindowFactory from '../containers/CompanionWindowFactory';
import MiradorMenuButton from '../containers/MiradorMenuButton';
import ns from '../config/css-ns';

const StyledRoot = styled('div')(({ theme }) => ({
const Root = styled('div', { name: 'CompanionArea', slot: 'root' })(({ position, theme }) => ({
display: 'flex',
minHeight: 0,
position: 'relative',
zIndex: theme.zIndex.appBar - 2,
...((position === 'bottom' || position === 'far-bottom') && {
flexDirection: 'column',
width: '100%',
}),
}));

const StyledWrapper = styled('div')({
});
const Container = styled('div', { name: 'CompanionArea', slot: 'container' })(({ ownerState }) => ({
display: ownerState?.companionAreaOpen ? 'flex' : 'none',
...((ownerState?.position === 'bottom' || ownerState?.position === 'far-bottom') && {
flexDirection: 'column',
width: '100%',
}),
...((ownerState?.position === 'left') && {
minWidth: '235px',
}),
}));

const StyledToggle = styled('div')(({ theme }) => ({
const StyledToggle = styled('div', { name: 'CompanionArea', slot: 'toggle' })(({ theme }) => ({
alignItems: 'center',
backgroundColor: theme.palette.background.paper,
border: `1px solid ${theme.palette.mode === 'dark' ? theme.palette.divider : theme.palette.shades?.dark}`,
Expand All @@ -28,18 +40,13 @@ const StyledToggle = styled('div')(({ theme }) => ({
height: '48px',
left: '100%',
marginTop: '1rem',
overflow: 'hidden',
padding: 2,
position: 'absolute',
width: '23px',
zIndex: theme.zIndex.drawer,
}));

const StyledToggleButton = styled(MiradorMenuButton)({
marginBottom: 1.5,
marginTop: 1.5,
padding: 0,
});

/** */
export class CompanionArea extends Component {
/** */
Expand Down Expand Up @@ -87,44 +94,31 @@ export class CompanionArea extends Component {
} = this.props;
const className = [this.areaLayoutClass(), ns(`companion-area-${position}`)].join(' ');
return (
<StyledRoot
sx={{
...((position === 'bottom' || position === 'far-bottom') && {
flexDirection: 'column',
width: '100%',
}),
}}
className={className}
>
<Root className={className}>
<Slide in={companionAreaOpen} direction={this.slideDirection()}>
<StyledWrapper
<Container
ownerState={this.props}
className={`${ns('companion-windows')} ${companionWindowIds.length > 0}`}
style={{ display: companionAreaOpen ? 'flex' : 'none' }}
sx={{
...((position === 'bottom' || position === 'far-bottom') && {
flexDirection: 'column',
width: '100%',
}),
}}
>
{companionWindowIds.map((id) => (
<CompanionWindowFactory id={id} key={id} windowId={windowId} />
))}
</StyledWrapper>
</Container>
</Slide>
{setCompanionAreaOpen && position === 'left' && sideBarOpen && companionWindowIds.length > 0 && (
<StyledToggle>
<StyledToggleButton
<MiradorMenuButton
aria-expanded={companionAreaOpen}
aria-label={companionAreaOpen ? t('collapseSidePanel') : t('expandSidePanel')}
edge="start"
onClick={() => { setCompanionAreaOpen(windowId, !companionAreaOpen); }}
TooltipProps={{ placement: 'right' }}
>
{this.collapseIcon()}
</StyledToggleButton>
</MiradorMenuButton>
</StyledToggle>
)}
</StyledRoot>
</Root>
);
}
}
Expand Down