Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

[FIX] Invalid font size for hiragana and katakana #559

Merged
merged 12 commits into from
Apr 20, 2021

Conversation

sctEdwin
Copy link
Contributor

@sctEdwin sctEdwin commented Mar 8, 2021

Two problem experienced in implementing Japanese livechat.

  1. hiragana and katakana only text input by user is reflected in large size.
    Before fix:
    image

After fix:
image

  1. ime conversion problem cause some Japanese to experience early conversion before finish inputting
    duplicate with [FIX] Rocket.Chat 3.0.12 Livechat issue about Korean IME #403 #538

@CLAassistant
Copy link

CLAassistant commented Mar 8, 2021

CLA assistant check
All committers have signed the CLA.

@rafaelblink
Copy link
Contributor

rafaelblink commented Mar 12, 2021

Hi @sctEdwin how are you man? Thanks for you contribution.

I'm reviewing your PR, and I've noticed that you removed the size of the transformEmojisToLargeSize, that font-size is required to transform only emojis messages into a bigger size:

image

Your solution solve the problem but only emojis messages are not being rendered as big size.

image

This is why that font-size: 2rem must be there, we cannot remove.

The main thing here, is because the method isOnlyEmoji method is recognizing japanese characters as emojis and we need to change that.

@rafaelblink rafaelblink self-requested a review March 12, 2021 17:01
src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
@sctEdwin
Copy link
Contributor Author

sctEdwin commented Mar 17, 2021

Hi @sctEdwin how are you man? Thanks for you contribution.

I'm reviewing your PR, and I've noticed that you removed the size of the transformEmojisToLargeSize, that font-size is required to transform only emojis messages into a bigger size:
Your solution solve the problem but only emojis messages are not being rendered as big size.
The main thing here, is because the method isOnlyEmoji method is recognizing japanese characters as emojis and we need to change that.

I excluded hiragana and katakana from being treated as emoji so no change is necessary for transformEmojisToLargeSize now. I checked the behavior for IE, Firefox, Chrome and Edge and all seems working well, hopefully you can accept this commit as hiragana and katakana are not emoji.
seemsOK

Reference for hiragana and katakana unicode codepoint:
hiragana
katakana

Copy link
Contributor

@rafaelblink rafaelblink left a comment

Choose a reason for hiding this comment

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

Hi @sctEdwin

Thanks for your good improvement.

Please check followed documentation and see that events names are camelCase.

https://reactjs.org/docs/events.html#composition-events

src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
@renatobecker
Copy link
Contributor

@sctEdwin can you please fix the conflicting file?
Thanks.

src/components/Composer/index.js Outdated Show resolved Hide resolved
@sctEdwin
Copy link
Contributor Author

sctEdwin commented Mar 19, 2021

@renatobecker Sorry it is a mess so I rebase my fork with the current develop branch in the original livechat repository
and include the changes again.
I don't know how to implement a state variable. It seems to solve the IME conversion problem in Japanese.

@sctEdwin sctEdwin reopened this Mar 19, 2021
src/components/Composer/index.js Outdated Show resolved Hide resolved
setState outside to keep render function pure
Copy link
Contributor

@rafaelblink rafaelblink left a comment

Choose a reason for hiding this comment

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

Hi @sctEdwin, please look at some changes requests that I made, ins't complex changes, please take attention on your code indentation, if possible, install ESLint on your code editor.

src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
src/components/Composer/index.js Outdated Show resolved Hide resolved
sctEdwin and others added 5 commits April 15, 2021 09:02
Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
@rafaelblink
Copy link
Contributor

Hi @sctEdwin, the PR isn't passing on the lint, please, see whats going on here.
https://github.com/RocketChat/Rocket.Chat.Livechat/pull/559/checks?check_run_id=2348204157

@sctEdwin
Copy link
Contributor Author

Hi @sctEdwin, the PR isn't passing on the lint, please, see whats going on here.
https://github.com/RocketChat/Rocket.Chat.Livechat/pull/559/checks?check_run_id=2348204157

@rafaelblink I installed ESLint onto Vim and fixed the error shown, it seems that the PR passed the test.

@sctEdwin sctEdwin requested a review from rafaelblink April 19, 2021 02:01
rafaelblink
rafaelblink previously approved these changes Apr 19, 2021
@renatobecker renatobecker changed the title hiragana and katakana only message text will not change to large size and ime conversion problem fixed [FIX] Invalid font size for hiragana and katakana Apr 20, 2021
@renatobecker renatobecker merged commit ef84f8b into RocketChat:develop Apr 20, 2021
tassoevan added a commit that referenced this pull request Apr 8, 2022
commit 43f9682
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Fri Apr 8 17:49:04 2022 -0300

    [FIX] Prevent html rendering on messages (#701)

commit 56ed044
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Sat Apr 2 00:11:42 2022 -0300

    Chore: Update cd.yml (#704)

commit f41cd48
Merge: 1cb7ae4 efa1456
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Fri Apr 1 23:14:48 2022 -0300

    Merge branch 'master' into develop

commit 1cb7ae4
Author: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date:   Fri Apr 1 00:39:47 2022 -0300

    Chore: Replace `a / b` with `math.div(a, b)` on SCSS files (#702)

commit 7e6ff4b
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Fri Apr 1 00:00:25 2022 -0300

    [IMPROVE] Add TypeScript (#694)

commit 6a16d3b
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Thu Mar 31 12:41:18 2022 -0300

    [IMPROVE] Replace i18n package (#657)

commit 3cc106a
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Tue Mar 29 22:54:37 2022 +0530

    [FIX] Revert: LoadConfig after registering guest (#696)

commit f3b8fbe
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Fri Mar 25 16:40:16 2022 -0300

    [FIX] Fixes broken triggers. (#695)

    * updated beginning of the file.

    * 1 fixed, 1 working, 1 to go

    * all working 🎉

commit fb1b2ee
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Fri Mar 25 10:45:48 2022 -0300

    [IMPROVE] Centralized e-mail validation under a library function (#693)

    * Centralized e-mail regex usage

    * moved constants out of the function

commit 12225f8
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Tue Mar 8 15:27:12 2022 -0300

    [FIX] Making sure the 'hide agent info' hides the agent info even with department change. (#688)

    * don't show agent name when setting disallows it

commit c04dcea
Merge: ca2d04e a0c38c9
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Thu Jan 20 11:39:40 2022 -0300

    Merge branch 'master' of github.com:RocketChat/Rocket.Chat.Livechat into develop

commit ca2d04e
Merge: 8da8b8b 1ee9420
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Thu Jan 20 11:09:05 2022 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Livechat into develop

commit 1ee9420
Author: shamsnaamir <54275157+shamsnaamir@users.noreply.github.com>
Date:   Thu Jan 20 17:29:35 2022 +0330

    [fa] Update FA translations (#653)

    Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>

commit d95ae3d
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Thu Jan 20 19:14:15 2022 +0530

    [NEW] Introduce Widget API method to manage Business Units (#677)

    Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

commit 8da8b8b
Merge: b5f0cce 43b0404
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Fri Jan 14 15:26:00 2022 -0300

    Merge branch 'master' into develop

commit b5f0cce
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Fri Jan 7 17:39:59 2022 -0300

    [FIX] IME not working properly (#674)

    * parse when submit only

    * fix storybook

commit 27ed909
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Fri Dec 31 00:42:24 2021 +0530

    Hide Livechat if omnichannel is disabled (#671)

commit 305939d
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Wed Dec 8 17:26:58 2021 -0300

    [IMPROVE] Change logic to generate token on Live Chat

commit 4c1777f
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Fri Dec 3 11:00:16 2021 -0300

    [NEW] Introduce `clearLocalStorageWhenChatEnded` setting logic (#666)

    Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>

commit 0b50f73
Author: Kevin Aleman <kevin.aleman@rocket.chat>
Date:   Mon Nov 22 09:29:40 2021 -0600

    Chore: Add PR title check (#663)

commit 760fcf5
Author: Ariel Barreiro <abarrei@gmail.com>
Date:   Fri Nov 19 16:08:18 2021 -0300

    [FIX] LoadConfig after registering guest (#640)

commit f7c3363
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Sat Nov 20 00:37:28 2021 +0530

    [FIX] Undo Css changes (#661)

commit 66c7a13
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Fri Nov 19 20:54:21 2021 +0530

    Fixes #572 - Body styles getting overridden (#660)

    * Fixes #572 - Body styles getting overriden

    * Fix build

commit b65502e
Merge: cb24408 f08bd01
Author: Kevin Aleman <kevin.aleman@rocket.chat>
Date:   Fri Nov 19 07:45:20 2021 -0600

    Merge pull request #646 from RocketChat/livechat-calls-fix-conflicts

    [NEW] Audio and Video calling in Livechat using WebRTC

commit f08bd01
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Fri Nov 19 16:20:15 2021 +0530

    Rename endTs property on Message to webRtcCallEndTs

commit 747142f
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Fri Nov 19 01:35:33 2021 +0530

    Refactor Call Statuses to remove redundancy

commit 6993764
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Thu Nov 18 18:24:56 2021 +0530

    Apply review suggestions

    - Use date-fns library to calculate call duration

commit d134a28
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Mon Oct 18 14:50:58 2021 +0530

    Fix typo

commit 8daee44
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Mon Oct 18 13:42:33 2021 +0530

    Fix Join call button layout

commit c0962e8
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Mon Oct 18 12:30:22 2021 +0530

    update Rocket.Chat.js.SDK version to 1.0.0-alpha.42

commit 2150c96
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Mon Sep 20 21:18:26 2021 +0530

    Improve overall codebase

    - Define an enum like structure for call statuses
    - Fix formatting and spelling issues
    - General refactoring

commit 2d2ca32
Author: murtaza98 <murtaza.patrawala@rocket.chat>
Date:   Tue Sep 14 18:01:52 2021 +0530

    [NEW] add-jitsi-call-support

    Co-Authored-By: Deepak Agarwal <56799414+Deepak-learner@users.noreply.github.com>

commit 5820ea5
Author: Deepak Agarwal <deepak710agarwal@gmail.com>
Date:   Thu Aug 19 21:30:47 2021 +0530

    [NEW] WebRTC-call in new tab for mobile devices (#629)

    * open webrtc call in new tab for mobile devices

    * improve codebase

    * add helper function

    * update one file

    * checking call status from room object

    * update one file

    * handle refresh case

    * change message filter condition

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

commit 853399d
Author: Dhruv Jain <51796498+djcruz93@users.noreply.github.com>
Date:   Tue Aug 17 23:11:19 2021 +0530

    [FIX] Notify agent on call decline (#634)

commit b52f484
Author: Dhruv Jain <51796498+djcruz93@users.noreply.github.com>
Date:   Tue Aug 17 17:11:59 2021 +0530

    [NEW] Handle endCall and expandView control buttons (#633)

    * [NEW] Handle endCall and expandView control buttons

    * [FIX] Lint errors

    * [FIX] Join Call Button giving call ended even when call inProgress

    * [FIX] slash omitted in the url

    * [REF] Remove redundant async keyword

    * [REF] Use spread operator, set ongoingCall status when expanding

    * [FIX] String enclosed within double quotes

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

    * [FIX] ongoingCall variable not destructured but used

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

commit a02f241
Author: Deepak Agarwal <deepak710agarwal@gmail.com>
Date:   Mon Aug 9 15:34:37 2021 +0530

    add joinCallBtn, endCall message, callRing functionalities. (#618)

    * add callnotification,msg,iframe code

    * fix eslint issues

    * fix eslint file path issues

    * fix stylelint issues

    * done ui changes

    * add join call button

    * add icons and improve ui

    * fix error

    * remove-icons

    * add icons

    * ui changes

    * add icon and timeout functionality

    * add I18n.t

    * add i18n.t, change classname, improve ui

    * remove font-family

    * change iframe link

    * add check for jitsi

    * add jitsi link

    * add time message in system message and add catch

    * display alert, change function name

    * Improve overall codebase

    * Convert tabs to spaces for translation file

    * Accept jitsi url info from the message and remove dependency from Livechat.videoCall endpoint

    * Update index.js

    * add message in i18n file

    * add joincall btn, call time, timeout

    * fix lint error

    * Update ShowJoinCallButton.js

    * fix conflicts

    * improve codebase

    * fix bugs

    * update some files

    * improve css, codebase and change condition

    * add correct link for iframe and joinCallBtn, show correct time

    * update call status at rc-core

    * update api file

    * rebase file

    * change link, use store class

    * update callIframe file

    * handle corner cases

    * remove file

    * Update room.js file

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

    * update one file

    * revert roomjs file

    * add common condition in room.js file

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

commit 14c4d17
Author: Deepak Agarwal <deepak710agarwal@gmail.com>
Date:   Thu Jul 22 20:05:55 2021 +0530

    add callnotification,callStartmsg,iframe code (#617)

    * add callnotification,msg,iframe code

    * fix eslint issues

    * fix eslint file path issues

    * fix stylelint issues

    * done ui changes

    * add icons and improve ui

    * fix error

    * remove-icons

    * add icons

    * add i18n.t, change classname, improve ui

    * remove font-family

    * change iframe link

    * add check for jitsi

    * add jitsi link

    * add time message in system message and add catch

    * display alert, change function name

    * Improve overall codebase

    * Convert tabs to spaces for translation file

    * Accept jitsi url info from the message and remove dependency from Livechat.videoCall endpoint

    * Update index.js

    * add message in i18n file

    Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>

commit cb24408
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Wed Oct 20 23:30:21 2021 +0530

    [FIX] 'Hide agent info' not working on system message (#651)

    * Fix 'Hide agent info' not working on chat transfer message

    * Fix 'Hide agent info' setting not working on move chat to queue sytem msg

    * update storybook

    * Remove i18n fixes

commit cb0695c
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Wed Oct 20 22:25:30 2021 +0530

    [FIX] Issues on Custom Livechat messages (#648)

    * Couple of fixes wrt custom messages

    - Fix offline success messages not working
    - Support HTML content on Offline message label

    * Support markdown data on Instructions panel

    * Update storybook

commit 663a574
Author: Rafael Ferreira <rafaelblink@gmail.com>
Date:   Tue Sep 14 15:34:39 2021 -0300

    [IMPROVE] Readme enhancements (#557)

    * new steps to run your local widget correctly

    * remove screenshot from repository

    * Update README.md

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit 7d2a875
Author: gridnine-developer <81713520+gridnine-developer@users.noreply.github.com>
Date:   Tue Sep 14 21:30:06 2021 +0300

    [IMPROVE] Swedish Translations (#573)

    Added some translations

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit 8bc8c25
Author: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date:   Tue Sep 14 23:58:28 2021 +0530

    [FIX] Escaping HTML on paste/drop Text (#471)

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit a48a85b
Author: Miguel Salcedo <imiguelsalcedo@gmail.com>
Date:   Tue Sep 14 15:27:21 2021 -0300

    [IMPROVE] Spanish translations (#370)

    * Full Spanish translation

    * Update es.json

    corrected: "invalid_email_e82f3682"

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit 2f120ea
Author: Vladislavs Stashkevichs <n4rayane@gmail.com>
Date:   Tue Sep 14 20:31:16 2021 +0300

    [IMPROVE] Russian translations (#644)

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit 02b4d33
Author: Kevin Aleman <kevin.aleman@rocket.chat>
Date:   Tue Sep 14 11:08:25 2021 -0600

    [IMPROVE] Add cookie to identify widget calls (#645)

commit 0ae132a
Merge: 63d1c5b 61986eb
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Fri Aug 20 11:22:18 2021 -0300

    Merge branch 'master' into develop

commit 63d1c5b
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date:   Thu Aug 19 21:45:48 2021 -0300

    [FIX] Iframe overlay (#631)

    * update widget height when triggered

    * fix state

    * fix lint error

    * fix

    * css fix

    * Lint me up inside

    Co-authored-by: Martin <martin.schoeler@rocket.chat>

commit 231e25a
Author: front-stream <contact@front-stream.com>
Date:   Wed Aug 18 17:15:57 2021 +0200

    [NEW] German informal translation (#622)

    * German informal translation

    * Rename de_informal.json to de_IN.json

    Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

commit bfd9fa3
Author: José Zadir Ferreira Neto <jzadir@gmail.com>
Date:   Wed Aug 18 12:15:16 2021 -0300

    Ajustanto erro na tradução de department (#632)

commit 34eed05
Author: silaslubberink <82575625+silaslubberink@users.noreply.github.com>
Date:   Tue Aug 17 16:28:21 2021 +0200

    Update translation (#601)

    A few fields were not yet translated. Corrected some translation errors.

commit 4f60b93
Author: Billy Noah <billynoah@gmail.com>
Date:   Tue Aug 3 17:29:49 2021 -0400

    [IMPROVE] Open links in another tab on Livechat widget (#610)

    prevent target attribute from being removed by sanitizer

commit 5498c56
Merge: 75b2429 fa5658b
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Wed Apr 21 00:34:37 2021 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Livechat into develop

commit fa5658b
Author: Deepak Agarwal <deepak710agarwal@gmail.com>
Date:   Wed Apr 21 09:02:55 2021 +0530

    [FIX] sound notification on/off (#567)

commit ef84f8b
Author: sctEdwin <72842751+sctEdwin@users.noreply.github.com>
Date:   Wed Apr 21 05:52:27 2021 +0900

    [FIX] Invalid font size for hiragana and katakana (#559)

    * fix hiragana katakana from being treated as emoji

    * fix ime conversion problem

    * inputLock as state

    * do not directly mutate state

    setState outside to keep render function pure

    * Update src/components/Composer/index.js

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>

    * Update src/components/Composer/index.js

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>

    * Update src/components/Composer/index.js

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>

    * Update src/components/Composer/index.js

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>

    * Update src/components/Composer/index.js

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>

    * fixed ESLint error

    * improve naming 2

    Co-authored-by: Rafael Ferreira <rafaelblink@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants