Skip to content

Commit 294922f

Browse files
olaurendeauAntoLC
authored andcommitted
🩹(frontend) do not display emoji as page icon on main pages
We decided to not display the leading emoji as page icon on the main pages to keep consistency in the document list.
1 parent 8b73aa3 commit 294922f

File tree

3 files changed

+29
-43
lines changed

3 files changed

+29
-43
lines changed

src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
verifyDocName,
99
} from './utils-common';
1010
import { mockedAccesses, mockedInvitations } from './utils-share';
11-
import { createRootSubPage } from './utils-sub-pages';
11+
import { createRootSubPage, getTreeRow } from './utils-sub-pages';
1212

1313
test.beforeEach(async ({ page }) => {
1414
await page.goto('/');
@@ -73,17 +73,8 @@ test.describe('Doc Header', () => {
7373
await verifyDocName(page, '👍 Hello Emoji World');
7474

7575
// Check the tree
76-
const docTree = page.getByTestId('doc-tree');
77-
await expect(docTree.getByText('Hello Emoji World')).toBeVisible();
78-
await expect(docTree.getByTestId('doc-emoji-icon')).toBeVisible();
79-
await expect(docTree.getByTestId('doc-simple-icon')).toBeHidden();
80-
81-
await page.getByTestId('home-button').click();
82-
83-
// Check the documents grid
84-
const gridRow = await getGridRow(page, 'Hello Emoji World');
85-
await expect(gridRow.getByTestId('doc-emoji-icon')).toBeVisible();
86-
await expect(gridRow.getByTestId('doc-simple-icon')).toBeHidden();
76+
const row = await getTreeRow(page, 'Hello Emoji World');
77+
await expect(row.getByText('👍')).toBeVisible();
8778
});
8879

8980
test('it deletes the doc', async ({ page, browserName }) => {

src/frontend/apps/e2e/__tests__/app-impress/utils-sub-pages.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,20 @@ export const addChild = async ({
107107
return name;
108108
};
109109

110+
export const getTreeRow = async (page: Page, title: string) => {
111+
const docTree = page.getByTestId('doc-tree');
112+
const row = docTree
113+
.getByRole('treeitem')
114+
.filter({
115+
hasText: title,
116+
})
117+
.first();
118+
119+
await expect(row).toBeVisible();
120+
121+
return row;
122+
};
123+
110124
export const navigateToTopParentFromTree = async ({ page }: { page: Page }) => {
111125
await page.getByRole('link', { name: /Open root document/ }).click();
112126
};

src/frontend/apps/impress/src/features/docs/doc-management/components/SimpleDocItem.tsx

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@ import { css } from 'styled-components';
44

55
import { Box, Text } from '@/components';
66
import { useCunninghamTheme } from '@/cunningham';
7-
import {
8-
Doc,
9-
getEmojiAndTitle,
10-
useDocUtils,
11-
useTrans,
12-
} from '@/docs/doc-management';
7+
import { Doc, useDocUtils, useTrans } from '@/docs/doc-management';
138
import { useResponsiveStore } from '@/stores';
149

1510
import ChildDocument from '../assets/child-document.svg';
1611
import PinnedDocumentIcon from '../assets/pinned-document.svg';
1712
import SimpleFileIcon from '../assets/simple-document.svg';
1813

19-
import { DocIcon } from './DocIcon';
20-
2114
const ItemTextCss = css`
2215
overflow: hidden;
2316
text-overflow: ellipsis;
@@ -45,10 +38,6 @@ export const SimpleDocItem = ({
4538
const { untitledDocument } = useTrans();
4639
const { isChild } = useDocUtils(doc);
4740

48-
const { emoji, titleWithoutEmoji: displayTitle } = getEmojiAndTitle(
49-
doc.title || untitledDocument,
50-
);
51-
5241
return (
5342
<Box
5443
$direction="row"
@@ -76,25 +65,17 @@ export const SimpleDocItem = ({
7665
data-testid="doc-pinned-icon"
7766
color={colorsTokens['primary-500']}
7867
/>
68+
) : isChild ? (
69+
<ChildDocument
70+
aria-hidden="true"
71+
data-testid="doc-child-icon"
72+
color={colorsTokens['primary-500']}
73+
/>
7974
) : (
80-
<DocIcon
81-
emoji={emoji}
82-
defaultIcon={
83-
isChild ? (
84-
<ChildDocument
85-
aria-hidden="true"
86-
data-testid="doc-child-icon"
87-
color={colorsTokens['primary-500']}
88-
/>
89-
) : (
90-
<SimpleFileIcon
91-
aria-hidden="true"
92-
data-testid="doc-simple-icon"
93-
color={colorsTokens['primary-500']}
94-
/>
95-
)
96-
}
97-
$size="25px"
75+
<SimpleFileIcon
76+
aria-hidden="true"
77+
data-testid="doc-simple-icon"
78+
color={colorsTokens['primary-500']}
9879
/>
9980
)}
10081
</Box>
@@ -106,7 +87,7 @@ export const SimpleDocItem = ({
10687
$css={ItemTextCss}
10788
data-testid="doc-title"
10889
>
109-
{displayTitle}
90+
{doc.title || untitledDocument}
11091
</Text>
11192
{(!isDesktop || showAccesses) && (
11293
<Box

0 commit comments

Comments
 (0)