Skip to content

Fix issues with script propagation in Excel as well as tree interceptor passthrough on init #15136

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

Merged
seanbudd merged 4 commits into from
Jul 17, 2023
+16 −9
Merged

Fix issues with script propagation in Excel as well as tree interceptor passthrough on init #15136

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
badbada
Fix issues with script propagation in Excel and tree interceptor pass…
LeonarddeR Jul 12, 2023
03657dc
Remove debug code
LeonarddeR Jul 13, 2023
11a8305
Merge remote-tracking branch 'origin/master' into excelFix
seanbudd Jul 17, 2023
d43f045
update changes
seanbudd Jul 17, 2023
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
4 changes: 3 additions & 1 deletion source/NVDAObjects/window/excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@ class ExcelBrowseModeTreeInterceptor(browseMode.BrowseModeTreeInterceptor):

def __init__(self,rootNVDAObject):
super(ExcelBrowseModeTreeInterceptor,self).__init__(rootNVDAObject)
self.passThrough=True
# Note, as _set_passThrough has logic to handle braille and vision updates which are unnecessary when
# initializing this tree interceptor, we set the private _passThrough variable here, which is enough.
self._passThrough = True
browseMode.reportPassThrough.last=True

def _get_currentNVDAObject(self):
Expand Down
8 changes: 3 additions & 5 deletions source/appModules/excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ def _get_focusRedirect(self):
e=UIAHandler.handler.lastFocusedUIAElement
if e and e.cachedAutomationID=="CellEdit":
obj=UIA(UIAElement=e)
oldFocus=api.getFocusObject()
if isinstance(oldFocus,ExcelCell):
# Set the edit control's parent as the cell that previously had focus. I.e. the cell being edited.
# otherwise a whole bunch of UIA focus ancestors for the edit control will be reported.
obj.parent=oldFocus
# Set the UIA edit control's parent to the parent of self.
# otherwise a whole bunch of UIA focus ancestors for the edit control will be reported.
obj.parent = self.parent
# Cache this for as long as this object exists.
self.focusRedirect=obj
return obj
Expand Down
6 changes: 5 additions & 1 deletion source/virtualBuffers/MSHTML.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ def __init__(self,rootNVDAObject):
# Force focus mode for applications, and dialogs with no parent treeInterceptor (E.g. a dialog embedded in an application)
if rootNVDAObject.role==controlTypes.Role.APPLICATION or (rootNVDAObject.role==controlTypes.Role.DIALOG and (not rootNVDAObject.parent or not rootNVDAObject.parent.treeInterceptor or rootNVDAObject.parent.treeInterceptor.passThrough)):
self.disableAutoPassThrough=True
self.passThrough=True
# Note, as _set_passThrough has logic to handle braille and vision updates which are unnecessary when
# initializing this tree interceptor, we set the private _passThrough variable here, which is enough.
self._passThrough = True
import browseMode
browseMode.reportPassThrough.last = True

def _getInitialCaretPos(self):
initialPos = super(MSHTML,self)._getInitialCaretPos()
Expand Down