@@ -136,6 +136,14 @@ class Constants {
136136 * @default 'off'
137137 */
138138 brailleMode = 'off' ;
139+
140+ /**
141+ * We lock the selection so we don't pick up programatic selection changes
142+ * @type {boolean }
143+ * @default false
144+ */
145+ lockSelection = false ;
146+
139147 /**
140148 * The current sonification mode. Can be 'on', 'off', 'sep' (seperated), or 'same' (all played at once).
141149 * @type {("on"|"off"|"sep"|"same") }
@@ -3782,6 +3790,7 @@ class Display {
37823790 }
37833791 }
37843792 if ( onoff == 'on' ) {
3793+ constants . lockSelection = true ;
37853794 if ( constants . chartType == 'box' ) {
37863795 // braille mode is on before any plot is selected
37873796 if (
@@ -3819,6 +3828,9 @@ class Display {
38193828 if ( position . x == - 1 && position . y == - 1 ) {
38203829 constants . brailleInput . setSelectionRange ( 0 , 0 ) ;
38213830 }
3831+ setTimeout ( function ( ) {
3832+ constants . lockSelection = false ;
3833+ } , 50 ) ;
38223834 } else {
38233835 constants . brailleMode = 'off' ;
38243836 document
@@ -3925,6 +3937,7 @@ class Display {
39253937 * Updates the position of the cursor in the braille display based on the current chart type and position.
39263938 */
39273939 UpdateBraillePos ( ) {
3940+ constants . lockSelection = true ;
39283941 if (
39293942 constants . chartType == 'bar' ||
39303943 constants . chartType == 'hist' ||
@@ -3954,6 +3967,11 @@ class Display {
39543967 let targetLabel = this . boxplotGridPlaceholders [ sectionPos ] ;
39553968 let haveTargetLabel = false ;
39563969 let adjustedPos = 0 ;
3970+ // bookmark: shiny issue: this is being called twice??
3971+ // and the issue happens on 2nd call, sometimes it skips like 75% or whatever
3972+ //
3973+ // on first call, we might call it multiple as we're setting up, I care but let's check that later
3974+
39573975 if ( constants . brailleData ) {
39583976 for ( let i = 0 ; i < constants . brailleData . length ; i ++ ) {
39593977 if ( constants . brailleData [ i ] . type != 'blank' ) {
@@ -3982,6 +4000,9 @@ class Display {
39824000 ) {
39834001 constants . brailleInput . setSelectionRange ( positionL1 . x , positionL1 . x ) ;
39844002 }
4003+ setTimeout ( function ( ) {
4004+ constants . lockSelection = false ;
4005+ } , 50 ) ;
39854006 }
39864007
39874008 /**
@@ -4286,16 +4307,20 @@ class Display {
42864307 constants . verboseText = verboseText ;
42874308 // aria live hack. If we're repeating (Space), aria won't detect if text is the same, so we modify vey slightly by adding / removing period at the end
42884309 if ( output == constants . infoDiv . innerHTML ) {
4289- if ( constants . infoDiv . innerHTML . endsWith ( '.' ) ) {
4290- if ( output . endsWith ( '.' ) ) {
4291- output = output . slice ( 0 , - 1 ) ;
4310+ if ( constants . infoDiv . textContent . endsWith ( '.' ) ) {
4311+ if ( output . endsWith ( '.</p> ' ) ) {
4312+ output = output . replace ( '.</p>' , '</p>' ) ;
42924313 }
42934314 } else {
4294- output = output + '.' ;
4315+ output = output . replace ( '</p>' , '.</p>' ) ;
42954316 }
42964317 }
42974318
4298- if ( constants . infoDiv ) constants . infoDiv . innerHTML = output ;
4319+ // could also try this hack, but we'll need a time gap
4320+ if ( constants . infoDiv ) {
4321+ constants . infoDiv . innerHTML = '' ;
4322+ constants . infoDiv . innerHTML = output ;
4323+ }
42994324 if ( constants . review ) {
43004325 if ( output . length > 0 ) {
43014326 constants . review . value = output . replace ( / < [ ^ > ] * > ? / gm, '' ) ;
@@ -8307,7 +8332,7 @@ class Control {
83078332 *
83088333 * @returns {void }
83098334 */
8310- SetControls ( ) {
8335+ async SetControls ( ) {
83118336 constants . events . push ( [
83128337 document ,
83138338 'keydown' ,
@@ -8406,6 +8431,12 @@ class Control {
84068431 constants . brailleMode == 'on' &&
84078432 constants . brailleInput . selectionStart
84088433 ) {
8434+ if ( constants . lockSelection ) {
8435+ return ;
8436+ }
8437+ // we lock the selection while we're changing stuff so it doesn't loop
8438+ constants . lockSelection = true ;
8439+
84098440 let cursorPos = constants . brailleInput . selectionStart ;
84108441 // we're using braille cursor, update the selection from what was clicked
84118442 cursorPos = constants . brailleInput . selectionStart ;
@@ -8447,18 +8478,29 @@ class Control {
84478478
84488479 // update display / text / audio
84498480 if ( testEnd ) {
8481+ this . lockPosition = true ;
84508482 control . UpdateAll ( ) ;
8483+ this . lockPosition = false ;
84518484 }
84528485 if ( testEnd ) {
84538486 audio . playEnd ( ) ;
84548487 }
84558488 }
8489+ setTimeout ( function ( ) {
8490+ constants . lockSelection = false ;
8491+ } , 50 ) ;
84568492 }
84578493 } ) ;
84588494 } else if ( [ ] . concat ( singleMaidr . type ) . includes ( 'heat' ) ) {
84598495 document . addEventListener ( 'selectionchange' , function ( e ) {
84608496 if ( constants . brailleMode == 'on' ) {
8497+ if ( constants . lockSelection ) {
8498+ return ;
8499+ }
8500+
84618501 let pos = constants . brailleInput . selectionStart ;
8502+ // we lock the selection while we're changing stuff so it doesn't loop
8503+ constants . lockSelection = true ;
84628504
84638505 // exception: don't let users click the seperator char
84648506 let seperatorPositions = constants . brailleInput . value
@@ -8490,6 +8532,9 @@ class Control {
84908532 if ( testEnd ) {
84918533 audio . playEnd ( ) ;
84928534 }
8535+ setTimeout ( function ( ) {
8536+ constants . lockSelection = false ;
8537+ } , 50 ) ;
84938538 } else {
84948539 // we're using normal cursor, let the default handle it
84958540 }
@@ -8505,23 +8550,35 @@ class Control {
85058550 ) {
85068551 document . addEventListener ( 'selectionchange' , function ( e ) {
85078552 if ( constants . brailleMode == 'on' ) {
8508- let pos = constants . brailleInput . selectionStart ;
8509- // we're using braille cursor, update the selection from what was clicked
8510- pos = constants . brailleInput . selectionStart ;
8511- if ( pos < 0 ) {
8512- pos = 0 ;
8553+ if ( constants . lockSelection ) {
8554+ return ;
85138555 }
8514- position . x = pos ;
8515- control . lockPosition ( ) ; // bar etc is default, no need to supply values
8516- let testEnd = true ;
85178556
8518- // update display / text / audio
8519- if ( testEnd ) {
8520- control . UpdateAll ( ) ;
8521- }
8522- if ( testEnd ) {
8523- audio . playEnd ( ) ;
8557+ // we lock the selection while we're changing stuff so it doesn't loop
8558+ constants . lockSelection = true ;
8559+
8560+ if ( constants . brailleInput ) {
8561+ let pos = constants . brailleInput . selectionStart ;
8562+ // we're using braille cursor, update the selection from what was clicked
8563+ pos = constants . brailleInput . selectionStart ;
8564+ if ( pos < 0 ) {
8565+ pos = 0 ;
8566+ }
8567+ position . x = pos ;
8568+ control . lockPosition ( ) ; // bar etc is default, no need to supply values
8569+ let testEnd = true ;
8570+
8571+ // update display / text / audio
8572+ if ( testEnd ) {
8573+ control . UpdateAll ( ) ;
8574+ }
8575+ if ( testEnd ) {
8576+ audio . playEnd ( ) ;
8577+ }
85248578 }
8579+ setTimeout ( function ( ) {
8580+ constants . lockSelection = false ;
8581+ } , 50 ) ;
85258582 } else {
85268583 // we're using normal cursor, let the default handle it
85278584 }
@@ -10081,8 +10138,14 @@ class Control {
1008110138 // braille cursor routing
1008210139 document . addEventListener ( 'selectionchange' , function ( e ) {
1008310140 if ( constants . brailleMode == 'on' ) {
10084- let pos = constants . brailleInput . selectionStart ;
10141+ if ( constants . lockSelection ) {
10142+ return ;
10143+ }
10144+ // we lock the selection while we're changing stuff so it doesn't loop
10145+ constants . lockSelection = true ;
10146+
1008510147 // we're using braille cursor, update the selection from what was clicked
10148+ let pos = constants . brailleInput . selectionStart ;
1008610149 pos = constants . brailleInput . selectionStart ;
1008710150 if ( pos < 0 ) {
1008810151 pos = 0 ;
@@ -10098,6 +10161,9 @@ class Control {
1009810161 if ( testEnd ) {
1009910162 audio . playEnd ( ) ;
1010010163 }
10164+ setTimeout ( function ( ) {
10165+ constants . lockSelection = false ;
10166+ } , 50 ) ;
1010110167 }
1010210168 } ) ;
1010310169
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?v=4&size=40){kind=avatar}
0 commit comments