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.

Sign up for GitHub

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

Jump to bottom

TNO-2994 Update Removing formatting icon #2286

Merged
merged 2 commits into from
Sep 13, 2024
Merged

TNO-2994 Update Removing formatting icon #2286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced39d7
TNO-2994 Update Removing formatting icon
laidaoyu Sep 12, 2024
7407f46
TNO-2994 Update tno-core version to 147
laidaoyu Sep 13, 2024
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
Binary file renamed ...ore-npm-0.1.146-9e30b7b728-b9387e0929.zip → ...ore-npm-0.1.147-119e2663b3-d08ec78a13.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion app/editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"redux-logger": "3.0.6",
"styled-components": "6.1.11",
"stylis": "4.3.2",
"tno-core": "0.1.146"
"tno-core": "0.1.147"
},
"devDependencies": {
"@simbathesailor/use-what-changed": "2.0.0",
Expand Down
10 changes: 5 additions & 5 deletions app/editor/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11074,7 +11074,7 @@ __metadata:
sass-extract-loader: 1.1.0
styled-components: 6.1.11
stylis: 4.3.2
tno-core: 0.1.146
tno-core: 0.1.147
typescript: 4.9.5
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -15258,9 +15258,9 @@ __metadata:
languageName: node
linkType: hard

"tno-core@npm:0.1.146":
version: 0.1.146
resolution: "tno-core@npm:0.1.146"
"tno-core@npm:0.1.147":
version: 0.1.147
resolution: "tno-core@npm:0.1.147"
dependencies:
"@elastic/elasticsearch": ^8.13.1
"@fortawesome/free-solid-svg-icons": ^6.4.2
Expand Down Expand Up @@ -15293,7 +15293,7 @@ __metadata:
styled-components: ^6.1.11
stylis: ^4.3.2
yup: ^1.1.1
checksum: b9387e09292ee5f1749b24e6d48e4ba790214639260c6c4ca454bc84e77279e34bc8c636f64cc9dd4ddb9d400f651edcee2a896f8078606241f2ea4e29046a11
checksum: d08ec78a13eb4d611f70986b89adbbed62269996fdb185dc84c9e7720af35e9045a1eb25ba1bd52fd2587a14191eccfb5046f75e9121c5f9ecbd522eb8e960bc
languageName: node
linkType: hard

Expand Down
Binary file renamed ...ore-npm-0.1.146-9e30b7b728-b9387e0929.zip → ...ore-npm-0.1.147-119e2663b3-d08ec78a13.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion app/subscriber/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"sheetjs": "file:packages/xlsx-0.20.1.tgz",
"styled-components": "6.1.11",
"stylis": "4.3.2",
"tno-core": "0.1.146"
"tno-core": "0.1.147"
},
"devDependencies": {
"@testing-library/jest-dom": "6.4.5",
Expand Down
10 changes: 5 additions & 5 deletions app/subscriber/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10705,7 +10705,7 @@ __metadata:
sheetjs: "file:packages/xlsx-0.20.1.tgz"
styled-components: 6.1.11
stylis: 4.3.2
tno-core: 0.1.146
tno-core: 0.1.147
typescript: 4.9.5
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -14750,9 +14750,9 @@ __metadata:
languageName: node
linkType: hard

"tno-core@npm:0.1.146":
version: 0.1.146
resolution: "tno-core@npm:0.1.146"
"tno-core@npm:0.1.147":
version: 0.1.147
resolution: "tno-core@npm:0.1.147"
dependencies:
"@elastic/elasticsearch": ^8.13.1
"@fortawesome/free-solid-svg-icons": ^6.4.2
Expand Down Expand Up @@ -14785,7 +14785,7 @@ __metadata:
styled-components: ^6.1.11
stylis: ^4.3.2
yup: ^1.1.1
checksum: b9387e09292ee5f1749b24e6d48e4ba790214639260c6c4ca454bc84e77279e34bc8c636f64cc9dd4ddb9d400f651edcee2a896f8078606241f2ea4e29046a11
checksum: d08ec78a13eb4d611f70986b89adbbed62269996fdb185dc84c9e7720af35e9045a1eb25ba1bd52fd2587a14191eccfb5046f75e9121c5f9ecbd522eb8e960bc
languageName: node
linkType: hard

Expand Down
7 changes: 4 additions & 3 deletions libs/npm/core/src/components/form/wysiwyg/CustomToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import { FaCode, FaEraser, FaExpandAlt, FaPaintBrush } from 'react-icons/fa';
import { FaCircleXmark, FaRegNewspaper } from 'react-icons/fa6';

import { Col, Row } from '../../flex';
import { Show } from '../../show';
import { FaCode, FaExpandAlt, FaPaintBrush, FaRemoveFormat } from 'react-icons/fa';
import { IUrlOption } from './interfaces';
import { FaCircleXmark, FaRegNewspaper } from 'react-icons/fa6';
export interface ICustomToolbarProps {
onClickRaw: React.MouseEventHandler<HTMLButtonElement>;
onClickRemoveFormat: React.MouseEventHandler<HTMLButtonElement>;
Expand Down Expand Up @@ -61,7 +62,7 @@ export const CustomToolbar: React.FC<ICustomToolbarProps> = ({
<FaCode className="custom-icon" />
</button>
<button type="button" onClick={onClickRemoveFormat} title="Remove formatting">
<FaRemoveFormat className="custom-icon" />
<FaEraser className="custom-icon" />
</button>
<button type="button" onClick={onClickFormatRaw} title="Format raw html">
<FaPaintBrush className="custom-icon" />
Expand Down
Loading