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

feat: Mark to check for the presence of drafts #8681

Merged

Conversation

miya
Copy link
Member

@miya miya commented Apr 4, 2024

Task

#132775 [v7][New Editor][collab] Editor で編集中またはドラフトが存在することを subnav から確認できる
#141357 デザイン実装

XD

Screenshot

スクリーンショット 2024-04-04 18 32 54

@miya miya requested a review from yuki-takei April 4, 2024 09:38
@miya miya self-assigned this Apr 4, 2024
@@ -113,6 +116,7 @@ export const PageEditorModeManager = (props: Props): JSX.Element => {
onClick={editButtonClickedHandler}
>
<span className="material-symbols-outlined me-1 fs-5">edit_square</span>{t('Edit')}
{ hasYjsDraft && <span className="position-absolute top-0 start-100 translate-middle p-1 bg-primary border border-light rounded-circle" />}
Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

border-light だけ、このままでいいのかどうか再考してほしい
light/dark mode 対応したほうがいいのか、外すだけで問題ないのか

Copy link
Member Author

Choose a reason for hiding this comment

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

border-light を外しました (ふみやさんと合意済み)

@@ -113,6 +116,7 @@ export const PageEditorModeManager = (props: Props): JSX.Element => {
onClick={editButtonClickedHandler}
>
<span className="material-symbols-outlined me-1 fs-5">edit_square</span>{t('Edit')}
{ hasYjsDraft && <span className="position-absolute top-0 start-100 translate-middle p-1 bg-primary border border-light rounded-circle" />}
Copy link
Member

Choose a reason for hiding this comment

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

border-light だけ、このままでいいのかどうか再考してほしい
light/dark mode 対応したほうがいいのか、外すだけで問題ないのか

@@ -68,6 +68,9 @@ export const PageEditorModeManager = (props: Props): JSX.Element => {

const { isCreating, createAndTransit } = useCreatePageAndTransit();

// TODO: https://redmine.weseek.co.jp/issues/132775
const hasYjsDraft = false;
Copy link
Member

Choose a reason for hiding this comment

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

名前これでいいのかな…
ストーリーに

View を見ているのかエディタを開いているのかという情報を含む

という条件を考慮するようには書いてあるので、後続タスクで変数名で何が相応しいのかは改めて考えてほしい

Copy link

reg-suit bot commented Apr 9, 2024

reg-suit detected visual differences.

Check this report, and review them.

🔴🔴🔴🔴🔴🔴

🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵

What do the circles mean? The number of circles represent the number of changed images.
🔴 : Changed items, ⚪ : New items, ⚫ : Deleted items, and 🔵 Passed items

How can I change the check status? If reviewers approve this PR, the reg context status will be green automatically.

@miya miya changed the base branch from master to feat/confirm-editor-is-active April 11, 2024 06:01
@miya miya merged commit 56f3a1a into feat/confirm-editor-is-active Apr 11, 2024
14 of 16 checks passed
@miya miya deleted the feat/141357-mark-for-draft-existence branch April 11, 2024 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants