From b91db7d2accb43a17b1bf5cff2a6a80d62148e15 Mon Sep 17 00:00:00 2001 From: Roy Johnson Date: Tue, 23 Apr 2024 15:52:22 -0500 Subject: [PATCH 1/2] Add start-selected messages [DISCO-251] --- src/app/messages/en/messages.json | 2 ++ src/app/messages/es/messages.json | 2 ++ src/app/messages/pl/messages.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/app/messages/en/messages.json b/src/app/messages/en/messages.json index e7ecc11074..4ba3ada95e 100644 --- a/src/app/messages/en/messages.json +++ b/src/app/messages/en/messages.json @@ -66,8 +66,10 @@ "i18n:highlighter:edit-note:label": "Edit highlighted note", "i18n:highlighter:highlight:end": "End of {style} highlight", "i18n:highlighter:highlight:start": "Start {style} highlight", + "i18n:highlighter:highlight:start-selected": "Start selected {style} highlight", "i18n:highlighter:highlight:end:search": "End of search result", "i18n:highlighter:highlight:start:search": "Start search result", + "i18n:highlighter:highlight:start-selected:search": "Start selected search result", "i18n:highlighting:button:cancel": "Cancel", "i18n:highlighting:button:delete": "Delete", "i18n:highlighting:button:save": "Save", diff --git a/src/app/messages/es/messages.json b/src/app/messages/es/messages.json index cfc3101047..9c0ccda37f 100644 --- a/src/app/messages/es/messages.json +++ b/src/app/messages/es/messages.json @@ -63,8 +63,10 @@ "i18n:highlighter:edit-note:label": "Editar nota resaltada", "i18n:highlighter:highlight:end": "Final de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}", "i18n:highlighter:highlight:start": "Comienzo de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}", + "i18n:highlighter:highlight:start-selected": "Comienzo de texto resaltado seleccionado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}", "i18n:highlighter:highlight:end:search": "Final de resultado de búsqueda", "i18n:highlighter:highlight:start:search": "Comienzo de resultado de búsqueda", + "i18n:highlighter:highlight:start-selected:search": "Comienzo de resultado de búsqueda seleccionado", "i18n:highlighting:button:cancel": "Cancelar", "i18n:highlighting:button:delete": "Eliminar", "i18n:highlighting:button:save": "Guardar", diff --git a/src/app/messages/pl/messages.json b/src/app/messages/pl/messages.json index 2dc00e9043..63fd89b9a3 100644 --- a/src/app/messages/pl/messages.json +++ b/src/app/messages/pl/messages.json @@ -63,8 +63,10 @@ "i18n:highlighter:edit-note:label": "edytuj notatkę", "i18n:highlighter:highlight:end": "Koniec {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia", "i18n:highlighter:highlight:start": "Początek {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia", + "i18n:highlighter:highlight:start-selected": "Początek {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} wybranego", "i18n:highlighter:highlight:end:search": "Koniec zakreślenia wyniku wyszukiwania", "i18n:highlighter:highlight:start:search": "Początek zakreślenia wyniku wyszukiwania", + "i18n:highlighter:highlight:start-selected:search": "Początek wybranego wyniku wyszukiwania", "i18n:highlighting:button:cancel": "Anuluj", "i18n:highlighting:button:delete": "Usuń", "i18n:highlighting:button:save": "Zachowaj", From e94ee04c9702bfbdcf307efdb6e58e772dedf752 Mon Sep 17 00:00:00 2001 From: Roy Johnson Date: Fri, 17 May 2024 15:47:04 -0500 Subject: [PATCH 2/2] Use .focus for current highlight --- package.json | 2 +- src/app/content/components/Page/PageContent.tsx | 4 ++-- yarn.lock | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 020c3dd526..48cb5e739f 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@craco/craco": "<7", "@formatjs/intl-pluralrules": "^5.2.3", "@openstax/event-capture-client": "^2.0.2", - "@openstax/highlighter": "https://github.com/openstax/highlighter#v1.14.2", + "@openstax/highlighter": "https://github.com/openstax/highlighter#use-mark-dist-branch", "@openstax/open-search-client": "0.1.0-build.7", "@openstax/ts-utils": "1.6.0", "@openstax/ui-components": "https://github.com/openstax/ui-components#1.3.4-post2", diff --git a/src/app/content/components/Page/PageContent.tsx b/src/app/content/components/Page/PageContent.tsx index b780df1100..18c49603f8 100644 --- a/src/app/content/components/Page/PageContent.tsx +++ b/src/app/content/components/Page/PageContent.tsx @@ -109,7 +109,7 @@ export default styled(MainContent)` } @media screen { - &[aria-current] { + &.focus { background-color: ${style.focused}; border-bottom: 0.2rem solid ${style.focusBorder}; padding: 0.2rem 0 0; @@ -138,7 +138,7 @@ export default styled(MainContent)` background-color: #ffea00; } - &[aria-current] { + &.focus { ${SELF_AND_CHILD_MATH_SELECTOR} { background-color: #ff9e4b; padding: 0.2rem 0; diff --git a/yarn.lock b/yarn.lock index 5876231132..0291226639 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5083,9 +5083,9 @@ dependencies: uuid "^8.3.2" -"@openstax/highlighter@https://github.com/openstax/highlighter#v1.14.2": - version "1.14.1" - resolved "https://github.com/openstax/highlighter#fcd259e1642e243de6ed95771d0b97249ff2d162" +"@openstax/highlighter@https://github.com/openstax/highlighter#use-mark-dist-branch": + version "1.14.0" + resolved "https://github.com/openstax/highlighter#0ef7228f54270372f7c67da80e716df58fbfc643" dependencies: "@openstax/highlights-client" "0.2.3" change-case "^4.0.0"