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.

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

fix: demo editor style and live re-render for mobile theme #2025

Merged
merged 7 commits into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"raw-loader": "^4.0.2",
"rc-motion": "^2.7.3",
"rc-tabs": "^12.10.0",
"rc-tooltip": "^6.1.3",
"rc-tree": "^5.7.9",
"rc-util": "^5.37.0",
"react-copy-to-clipboard": "^5.1.0",
Expand Down
13 changes: 6 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/client/theme-api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ export interface IPreviewerProps {
* react node of current demo
*/
children: ReactNode;
/**
* private field, do not use it in your code
*/
_live_in_iframe: boolean;
[key: string]: any;
}

Expand Down
2 changes: 1 addition & 1 deletion src/client/theme-default/builtins/Previewer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Previewer: FC<IPreviewerProps> = (props) => {
loading: liveDemoLoading,
setSource: setLiveDemoSource,
} = useLiveDemo(props.asset.id, {
iframe: Boolean(props.iframe),
iframe: Boolean(props.iframe || props._live_in_iframe),
containerRef: demoContainer,
});

Expand Down
47 changes: 47 additions & 0 deletions src/client/theme-default/slots/PreviewerActions/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -268,3 +268,50 @@
display: none;
}
}

.dumi-theme-default-tooltip {
position: fixed;
min-width: 30px;
margin-bottom: 8px;
box-sizing: border-box;

&-hidden {
display: none;
}

&-arrow {
border: 4px solid transparent;
opacity: 0.7;
}

&-placement-top {
.dumi-theme-default-tooltip-arrow {
border-top-color: #000;
transform: translate(-50%, 100%);
}
}

&-bottom {
.dumi-theme-default-tooltip-arrow {
border-bottom-color: #000;
transform: translateY(-50%, -100%);
}
}

&-content {
padding: 5px 8px;
color: #fff;
font-size: 13px;
line-height: 1.1;
white-space: nowrap;
background-color: #000;
opacity: 0.7;
border-radius: 2px;
box-shadow: 0 4px 10px rgba(0, 0, 0, 10%);
box-sizing: border-box;

@{dark-selector} & {
background-color: #222;
}
}
}
54 changes: 40 additions & 14 deletions src/client/theme-default/slots/PreviewerActions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,28 @@ import SourceCode from 'dumi/theme/builtins/SourceCode';
import PreviewerActionsExtra from 'dumi/theme/slots/PreviewerActionsExtra';
import SourceCodeEditor from 'dumi/theme/slots/SourceCodeEditor';
import Tabs from 'rc-tabs';
import RcTooltip from 'rc-tooltip';
import type { TooltipProps as RcTooltipProps } from 'rc-tooltip/lib/Tooltip';
import React, { useRef, useState, type FC, type ReactNode } from 'react';
import './index.less';

export interface TooltipProps extends Omit<RcTooltipProps, 'overlay'> {
placement?: 'top' | 'bottom';
title?: React.ReactNode;
}

const Tooltip: FC<TooltipProps> = (props) => {
const { title, placement = 'top', ...rest } = props;
return (
<RcTooltip
prefixCls="dumi-theme-default-tooltip"
placement={placement}
{...rest}
overlay={title}
/>
);
};

export interface IPreviewerActionsProps extends IPreviewerProps {
/**
* disabled actions
Expand Down Expand Up @@ -209,15 +229,18 @@ const PreviewerActions: FC<IPreviewerActionsProps> = (props) => {
});
}}
extra={
<button
type="button"
className="dumi-default-previewer-editor-tip-btn"
data-dumi-tooltip={intl.formatMessage({
<Tooltip
title={intl.formatMessage({
id: 'previewer.actions.code.editable',
})}
>
<IconEdit />
</button>
<button
type="button"
className="dumi-default-previewer-editor-tip-btn"
>
<IconEdit />
</button>
</Tooltip>
}
/>
) : (
Expand All @@ -227,17 +250,20 @@ const PreviewerActions: FC<IPreviewerActionsProps> = (props) => {
// only show readonly tip for non-entry files
// because readonly entry file means live compile is not available for this demo tech stack
i !== 0 && (
<button
type="button"
className="dumi-default-previewer-editor-tip-btn"
data-dumi-tooltip={intl.formatMessage({
<Tooltip
title={intl.formatMessage({
id: 'previewer.actions.code.readonly',
})}
data-readonly
>
<span></span>
<IconEdit />
</button>
<button
type="button"
className="dumi-default-previewer-editor-tip-btn"
data-readonly
>
<span></span>
<IconEdit />
</button>
</Tooltip>
)
}
>
Expand Down
22 changes: 22 additions & 0 deletions suites/theme-mobile/src/builtins/Previewer/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,23 @@
}
}

&-sources {
flex: 1;
height: 0;
}

&-tabs {
height: 100%;

.dumi-default-tabs {
&-content,
&-tabpane,
&-content-holder {
height: 100%;
}
}
}

&-action-btn > svg {
width: 17px;
}
Expand All @@ -73,10 +90,15 @@
}

.dumi-default-source-code {
height: 100%;
flex: 1;
min-height: 0;
overflow: auto;
border-bottom-right-radius: 0;

&-editor {
height: 100%;
}
}
}
}
1 change: 1 addition & 0 deletions suites/theme-mobile/src/builtins/Previewer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const MobilePreviewer: FC<IPreviewerProps> = (props) => {
? `${themeConfig.deviceWidth}px`
: undefined,
}}
_live_in_iframe={mobile}
>
{mobile && (
<Device
Expand Down
Loading