filecoin-project/slate
1
1
Fork 0
mirror of https://github.com/filecoin-project/slate.git synced 2024-12-25 18:13:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed GlobalCarrousel not showing on mobile

Browse Source
This commit is contained in:
Aminejvm 2021-02-05 10:25:47 +01:00
parent 2f36713692
commit ef9338b160
3 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/core/SlateLayout.js
View File

@ -1098,17 +1098,6 @@ export class SlateLayout extends React.Component {
let unit = this.state.unit;
return (
<div>
<GlobalCarousel
carouselType="SLATE"
onUpdateViewer={this.props.onUpdateViewer}
viewer={this.props.viewer}
objects={this.state.items}
current={this.props.current}
onAction={this.props.onAction}
mobile={this.props.mobile}
isOwner={this.props.isOwner}
external={this.props.external}
/>
{this.props.isOwner ? (
this.state.editing ? (
<div

9
pages/_/slate.js
View File

@ -12,6 +12,7 @@ import { css } from "@emotion/react";
import { ViewAllButton } from "~/components/core/ViewAll";
import { SlateLayout } from "~/components/core/SlateLayout";
import { SlateLayoutMobile } from "~/components/core/SlateLayoutMobile";
import { GlobalCarousel } from "~/components/system/components/GlobalCarousel";
import { GlobalModal } from "~/components/system/components/GlobalModal";
import ProcessedText from "~/components/core/ProcessedText";
@ -308,6 +309,14 @@ export default class SlatePage extends React.Component {
</div>
</div>
<div css={STYLES_SLATE}>
<GlobalCarousel
carouselType="SLATE"
viewer={this.props.viewer}
objects={objects}
mobile={this.props.mobile}
isOwner={false}
external
/>
{this.props.mobile ? (
<SlateLayoutMobile
isOwner={false}

60
scenes/SceneSlate.js
View File

@ -13,6 +13,7 @@ import { SlateLayout } from "~/components/core/SlateLayout";
import { SlateLayoutMobile } from "~/components/core/SlateLayoutMobile";
import { FileTypeGroup } from "~/components/core/FileTypeIcon";
import { ButtonPrimary, ButtonSecondary } from "~/components/system/components/Buttons";
import { GlobalCarousel } from "~/components/system/components/GlobalCarousel";
import ProcessedText from "~/components/core/ProcessedText";
import ScenePage from "~/components/core/ScenePage";
@ -361,35 +362,48 @@ class SlatePage extends React.Component {
</ScenePageHeader>
<span css={STYLES_MOBILE_ONLY}>{actions}</span>
{objects && objects.length ? (
this.props.mobile ? (
<SlateLayoutMobile
<>
<GlobalCarousel
carouselType="SLATE"
onUpdateViewer={this.props.onUpdateViewer}
viewer={this.props.viewer}
objects={objects}
current={this.props.current}
onAction={this.props.onAction}
mobile={this.props.mobile}
isOwner={isOwner}
items={objects}
fileNames={layouts && layouts.ver === "2.0" ? layouts.fileNames : false}
onSelect={this._handleSelect}
external={this.props.external}
/>
) : (
<div style={{ marginTop: isOwner ? 24 : 48 }}>
<SlateLayout
key={this.props.current.id}
current={this.props.current}
onUpdateViewer={this.props.onUpdateViewer}
viewer={this.props.viewer}
slateId={this.props.current.id}
layout={layouts && layouts.ver === "2.0" ? layouts.layout || [] : null}
onSaveLayout={this._handleSaveLayout}
onSave={this._handleSave}
{this.props.mobile ? (
<SlateLayoutMobile
isOwner={isOwner}
fileNames={layouts && layouts.ver === "2.0" ? layouts.fileNames : false}
preview={preview}
onSavePreview={(preview) => this._handleSave(null, null, null, false, preview)}
items={objects}
fileNames={layouts && layouts.ver === "2.0" ? layouts.fileNames : false}
onSelect={this._handleSelect}
defaultLayout={layouts && layouts.ver === "2.0" ? layouts.defaultLayout : true}
onAction={this.props.onAction}
/>
</div>
)
) : (
<div style={{ marginTop: isOwner ? 24 : 48 }}>
<SlateLayout
key={this.props.current.id}
current={this.props.current}
onUpdateViewer={this.props.onUpdateViewer}
viewer={this.props.viewer}
slateId={this.props.current.id}
layout={layouts && layouts.ver === "2.0" ? layouts.layout || [] : null}
onSaveLayout={this._handleSaveLayout}
onSave={this._handleSave}
isOwner={isOwner}
fileNames={layouts && layouts.ver === "2.0" ? layouts.fileNames : false}
preview={preview}
onSavePreview={(preview) => this._handleSave(null, null, null, false, preview)}
items={objects}
onSelect={this._handleSelect}
defaultLayout={layouts && layouts.ver === "2.0" ? layouts.defaultLayout : true}
onAction={this.props.onAction}
/>
</div>
)}
</>
) : isOwner ? (
<div>
<EmptyState>