Skip to content
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

Move "mouseover" config from BaseLinearDisplay to LinearBasicDisplay display #1666

Merged
merged 3 commits into from
Mar 5, 2021
Merged

Move "mouseover" config from BaseLinearDisplay to LinearBasicDisplay display #1666

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
6ce076c
Move "mouseover" config from base to basic display
garrettjstevens Feb 3, 2021
17fdb22
Merge branch 'master' into mouseover_to_basic_display
garrettjstevens Mar 4, 2021
d7e7cee
Merge branch 'master' into mouseover_to_basic_display
garrettjstevens Mar 4, 2021
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
72 changes: 36 additions & 36 deletions ...g/src/ConfigurationEditorWidget/components/__snapshots__/ConfigurationEditor.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,42 @@ exports[`ConfigurationEditor widget renders with defaults of the PileupTrack sch
class="makeStyles-root"
data-testid="configEditor"
>
<div
class="MuiPaper-root makeStyles-paper MuiPaper-elevation1 MuiPaper-rounded"
>
<div
class="makeStyles-paperContent"
>
<div
class="MuiFormControl-root MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
data-shrink="true"
>
maxDisplayedBpPerPx
</label>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiInput-input"
type="number"
value="1000"
/>
</div>
<p
class="MuiFormHelperText-root MuiFormHelperText-filled"
>
maximum bpPerPx that is displayed in the view
</p>
</div>
</div>
<div
class="makeStyles-slotModeSwitch"
/>
</div>
<div
class="MuiPaper-root makeStyles-paper MuiPaper-elevation1 MuiPaper-rounded"
>
Expand Down Expand Up @@ -876,42 +912,6 @@ exports[`ConfigurationEditor widget renders with defaults of the PileupTrack sch
</button>
</div>
</div>
<div
class="MuiPaper-root makeStyles-paper MuiPaper-elevation1 MuiPaper-rounded"
>
<div
class="makeStyles-paperContent"
>
<div
class="MuiFormControl-root MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
data-shrink="true"
>
maxDisplayedBpPerPx
</label>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiInput-input"
type="number"
value="1000"
/>
</div>
<p
class="MuiFormHelperText-root MuiFormHelperText-filled"
>
maximum bpPerPx that is displayed in the view
</p>
</div>
</div>
<div
class="makeStyles-slotModeSwitch"
/>
</div>
<label
class="MuiFormLabel-root"
>
Expand Down
8 changes: 0 additions & 8 deletions plugins/linear-genome-view/src/BaseLinearDisplay/models/baseLinearDisplayConfigSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ import { ConfigurationSchema } from '@jbrowse/core/configuration'
export const baseLinearDisplayConfigSchema = ConfigurationSchema(
'BaseLinearDisplay',
{
mouseover: {
type: 'string',
description: 'what to display in a given mouseover',
defaultValue: `function(feature) {
return feature.get('name')
}`,
functionSignature: ['feature'],
},
maxDisplayedBpPerPx: {
type: 'number',
description: 'maximum bpPerPx that is displayed in the view',
Expand Down
8 changes: 8 additions & 0 deletions plugins/linear-genome-view/src/LinearBasicDisplay/configSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ export default function configSchemaFactory(pluginManager: PluginManager) {
return ConfigurationSchema(
'LinearBasicDisplay',
{
mouseover: {
type: 'string',
description: 'what to display in a given mouseover',
defaultValue: `function(feature) {
return feature.get('name')
}`,
functionSignature: ['feature'],
},
renderer: pluginManager.pluggableConfigSchemaType('renderer'),
// overrides base
maxDisplayedBpPerPx: {
Expand Down