Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

feat: move asset preview to horizontal #870

Merged
merged 5 commits into from
Aug 22, 2019
Merged

feat: move asset preview to horizontal #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45ae86c
moved sidebar
riagarg Aug 21, 2019
f48d20b
edited css
riagarg Aug 21, 2019
4251fae
add columnwidth test
elizabethhalper Aug 21, 2019
5f6a714
clean up test
elizabethhalper Aug 22, 2019
c391ac9
add consts
elizabethhalper Aug 22, 2019
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
4 changes: 3 additions & 1 deletion src/react/components/pages/editorPage/editorPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
overflow: hidden;
position: relative;

&-sidebar {
&-bottombar {
display: flex;
flex-grow: 1;
flex-direction: row;

&-nav {
height: 100%;
width: 100%;

.asset-list {
Expand Down
24 changes: 12 additions & 12 deletions src/react/components/pages/editorPage/editorPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,22 +187,13 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
icon={"fa-lock"}
handler={this.handleCtrlTagHotKey} />);
})}
<SplitPane split="vertical"
defaultSize={this.state.thumbnailSize.width}
<SplitPane split="horizontal"
minSize={100}
maxSize={400}
paneStyle={{ display: "flex" }}
onChange={this.onSideBarResize}
onDragFinished={this.onSideBarResizeComplete}>
<div className="editor-page-sidebar bg-lighter-1">
<EditorSideBar
assets={rootAssets}
selectedAsset={selectedAsset ? selectedAsset.asset : null}
onBeforeAssetSelected={this.onBeforeAssetSelected}
onAssetSelected={this.selectAsset}
thumbnailSize={this.state.thumbnailSize}
/>
</div>
onDragFinished={this.onSideBarResizeComplete}
primary={"second"}>
<div className="editor-page-content" onClick={this.onPageClick}>
<div className="editor-page-content-main">
<div className="editor-page-content-main-header">
Expand Down Expand Up @@ -259,6 +250,15 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
confirmButtonColor="danger"
onConfirm={this.onTagDeleted} />
</div>
<div className="editor-page-bottombar bg-lighter-1">
<EditorSideBar
assets={rootAssets}
selectedAsset={selectedAsset ? selectedAsset.asset : null}
onBeforeAssetSelected={this.onBeforeAssetSelected}
onAssetSelected={this.selectAsset}
thumbnailSize={this.state.thumbnailSize}
/>
</div>
</SplitPane>
<Alert show={this.state.showInvalidRegionWarning}
title={strings.editorPage.messages.enforceTaggedRegions.title}
Expand Down
31 changes: 26 additions & 5 deletions src/react/components/pages/editorPage/editorSideBar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import EditorSideBar, { IEditorSideBarProps, IEditorSideBarState } from "./editorSideBar";
import { ReactWrapper, mount } from "enzyme";
import { AutoSizer, List } from "react-virtualized";
import { AutoSizer, Grid } from "react-virtualized";
import MockFactory from "../../../../common/mockFactory";

describe("Editor SideBar", () => {
Expand All @@ -21,7 +21,7 @@ describe("Editor SideBar", () => {
const wrapper = createComponent(props);
expect(wrapper.exists()).toBe(true);
expect(wrapper.find(AutoSizer).exists()).toBe(true);
expect(wrapper.find(List).exists()).toBe(true);
expect(wrapper.find(Grid).exists()).toBe(true);
});

it("Initializes state without asset selected", () => {
Expand Down Expand Up @@ -117,8 +117,8 @@ describe("Editor SideBar", () => {
};

const wrapper = createComponent(props);
const list = wrapper.find(List).instance() as List;
const recomputeRowHeightsSpy = jest.spyOn(list, "recomputeRowHeights");
const grid = wrapper.find(Grid).instance() as Grid;
const recomputeGridSizeSpy = jest.spyOn(grid, "recomputeGridSize");

wrapper.setProps({
thumbnailSize: {
Expand All @@ -127,6 +127,27 @@ describe("Editor SideBar", () => {
},
});

expect(recomputeRowHeightsSpy).toBeCalled();
expect(recomputeGridSizeSpy).toBeCalled();
});

it("Correctly computes Grid column size", () => {
const props: IEditorSideBarProps = {
assets: testAssets,
onAssetSelected: onSelectAssetHandler,
thumbnailSize: {
width: 175,
height: 155,
},
};

const wrapper = createComponent(props);
const grid = wrapper.find(Grid).instance() as Grid;
const autoSizer = wrapper.find(AutoSizer).instance() as AutoSizer;
autoSizer.setState({
width: 150,
height: 91,
});

expect(grid.props.columnWidth()).toBe(100);
});
});
30 changes: 17 additions & 13 deletions src/react/components/pages/editorPage/editorSideBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { AutoSizer, List } from "react-virtualized";
import { AutoSizer, Grid } from "react-virtualized";
import { IAsset, AssetState, ISize } from "../../../../models/applicationState";
import { AssetPreview } from "../../common/assetPreview/assetPreview";
import { strings } from "../../../../common/strings";
Expand Down Expand Up @@ -38,23 +38,24 @@ export default class EditorSideBar extends React.Component<IEditorSideBarProps,
: 0,
};

private listRef: React.RefObject<List> = React.createRef();
private listRef: React.RefObject<Grid> = React.createRef();

public render() {
return (
<div className="editor-page-sidebar-nav">
<AutoSizer>
{({ height, width }) => (
<List
<Grid
ref={this.listRef}
className="asset-list"
cellRenderer={this.rowRenderer}
columnCount={this.props.assets.length}
columnWidth={() => this.getColumnWidth(height)}
height={height}
width={width}
rowCount={this.props.assets.length}
rowHeight={() => this.getRowHeight(width)}
rowCount={1}
rowHeight={height}
rowRenderer={this.rowRenderer}
overscanRowCount={2}
scrollToIndex={this.state.scrollToIndex}
/>
)}
</AutoSizer>
Expand All @@ -64,7 +65,7 @@ export default class EditorSideBar extends React.Component<IEditorSideBarProps,

public componentDidUpdate(prevProps: IEditorSideBarProps) {
if (prevProps.thumbnailSize !== this.props.thumbnailSize) {
this.listRef.current.recomputeRowHeights();
this.listRef.current.recomputeGridSize();
}

if (!prevProps.selectedAsset && !this.props.selectedAsset) {
Expand All @@ -77,8 +78,11 @@ export default class EditorSideBar extends React.Component<IEditorSideBarProps,
}
}

private getRowHeight = (width: number) => {
return width / (4 / 3) + 16;
private getColumnWidth = (height: number) => {
const padding = 16;
const aspectRatio = 4 / 3;

return (height - padding) * aspectRatio;
}

private selectAsset = (selectedAsset: IAsset): void => {
Expand All @@ -87,7 +91,7 @@ export default class EditorSideBar extends React.Component<IEditorSideBarProps,
this.setState({
scrollToIndex,
}, () => {
this.listRef.current.forceUpdateGrid();
this.listRef.current.forceUpdate();
});
}

Expand All @@ -102,8 +106,8 @@ export default class EditorSideBar extends React.Component<IEditorSideBarProps,
this.props.onAssetSelected(asset);
}

private rowRenderer = ({ key, index, style }): JSX.Element => {
const asset = this.props.assets[index];
private rowRenderer = ({ columnIndex, key, style }): JSX.Element => {
Copy link
Contributor

@mydiemho mydiemho Aug 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

switching index and key location on purpose?

const asset = this.props.assets[columnIndex];
const selectedAsset = this.props.selectedAsset;

return (
Expand Down