Skip to content

Use only relevant selectors for keybindings to prevent conflicts #603

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
martinRenou merged 3 commits into from
Apr 7, 2025
Merged

Use only relevant selectors for keybindings to prevent conflicts #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0035891
Use only relevant selectors for keybindings to prevent conflicts
arjxn-py Apr 4, 2025
b93285c
Merge branch 'main' into keybinding-identify
arjxn-py Apr 4, 2025
750ffa2
my bad
arjxn-py Apr 6, 2025
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
2 changes: 1 addition & 1 deletion packages/base/src/keybindings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
{
"command": "jupytergis:identify",
"keys": ["Accel I"],
"keys": ["I"],
"selector": ".data-jgis-keybinding"
},
{
Expand Down
3 changes: 2 additions & 1 deletion packages/base/src/mainview/mainView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,8 @@ export class MainView extends React.Component<IProps, IStates> {
/>
)}
<div
className="jGIS-Mainview"
className="jGIS-Mainview data-jgis-keybinding"
tabIndex={-2}
style={{
border: this.state.remoteUser
? `solid 3px ${this.state.remoteUser.color}`
Expand Down
6 changes: 3 additions & 3 deletions packages/base/src/panelview/components/layers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const LAYER_ITEM_CLASS = 'jp-gis-layerItem';
const LAYER_CLASS = 'jp-gis-layer';
const LAYER_TITLE_CLASS = 'jp-gis-layerTitle';
const LAYER_ICON_CLASS = 'jp-gis-layerIcon';
const LAYER_TEXT_CLASS = 'jp-gis-layerText';
const LAYER_TEXT_CLASS = 'jp-gis-layerText data-jgis-keybinding';

/**
* The layers panel widget.
Expand Down Expand Up @@ -300,7 +300,7 @@ function LayerGroupComponent(props: ILayerGroupProps): JSX.Element {
className={`${LAYER_GROUP_COLLAPSER_CLASS}${open ? ' jp-mod-expanded' : ''}`}
tag={'span'}
/>
<span id={id} className={LAYER_TEXT_CLASS}>
<span id={id} className={LAYER_TEXT_CLASS} tabIndex={-2}>
{name}
</span>
</div>
Expand Down Expand Up @@ -435,7 +435,7 @@ function LayerComponent(props: ILayerProps): JSX.Element {
/>
)}

<span id={id} className={LAYER_TEXT_CLASS}>
<span id={id} className={LAYER_TEXT_CLASS} tabIndex={-2}>
{name}
</span>
</div>
Expand Down
2 changes: 2 additions & 0 deletions packages/base/src/panelview/leftpanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ export class LeftPanelWidget extends SidePanel {
constructor(options: LeftPanelWidget.IOptions) {
super();
this.addClass('jGIS-sidepanel-widget');
this.addClass('data-jgis-keybinding');
this.node.tabIndex = 0;

this._model = options.model;
this._state = options.state;
Expand Down
2 changes: 2 additions & 0 deletions packages/base/src/panelview/rightpanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export class RightPanelWidget extends SidePanel {
constructor(options: RightPanelWidget.IOptions) {
super();
this.addClass('jGIS-sidepanel-widget');
this.addClass('data-jgis-keybinding');
this.node.tabIndex = 0;

this._model = options.model;
this._annotationModel = options.annotationModel;
Expand Down
2 changes: 0 additions & 2 deletions python/jupytergis_lab/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ const plugin: JupyterFrontEndPlugin<void> = {
completionProviderManager
);

app.shell.addClass('data-jgis-keybinding');

// SOURCES context menu
const newSourceSubMenu = new Menu({ commands: app.commands });
newSourceSubMenu.title.label = translator
Expand Down
Loading