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

Jump to bottom

iframe integrations #8

Merged
merged 29 commits into from Jul 2, 2023
Merged

iframe integrations #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
70d6174
matrix render instead auto
stan-donarise Jun 7, 2023
c858685
only one font-family source
stan-donarise Jun 7, 2023
5a251c0
pie data refactor
stan-donarise Jun 7, 2023
a81dd94
discovery fix
stan-donarise Jun 9, 2023
adf8e6e
$visavis_plot_legend_cmp (discovery cmp)
stan-donarise Jun 9, 2023
b8ac41e
matrix cmp
stan-donarise Jun 10, 2023
ecefb5b
matrix reorder
stan-donarise Jun 10, 2023
88b9266
visavis_phase -> visavis_plot_phase
stan-donarise Jun 10, 2023
f9bb193
$visavis (iframe checker)
stan-donarise Jun 10, 2023
8e482f8
cube cmp
stan-donarise Jun 10, 2023
b497786
matrix events
stan-donarise Jun 10, 2023
dbd5433
cube_click
stan-donarise Jun 10, 2023
af5aaa3
deploy visavis/-
stan-donarise Jun 10, 2023
508646a
Revert "deploy visavis/-"
stan-donarise Jun 20, 2023
0e09e6c
visavis-plot web component;
stan-donarise Jun 20, 2023
00c94fe
$visavis_elements static
stan-donarise Jun 20, 2023
a18f4e0
cube plot_body fix
stan-donarise Jun 24, 2023
5630a64
fixel, fullscreen
stan-donarise Jun 25, 2023
d1c6eef
$visavis_plot.register()
stan-donarise Jun 29, 2023
2a02965
phase_click
stan-donarise Jun 29, 2023
4a4b321
show_fixel
stan-donarise Jun 29, 2023
4eba2b5
mpds namespace
stan-donarise Jun 29, 2023
6a135df
plotly js node build hack (self)
stan-donarise Jun 29, 2023
8baf410
$lib_d3 -> $mpds_visavis_lib.d3
stan-donarise Jun 29, 2023
3ff5c50
scrollbar style
stan-donarise Jun 30, 2023
06092b3
phase fix
stan-donarise Jul 1, 2023
d852306
remove mpds_visavis_plot.register()
stan-donarise Jul 2, 2023
4433f23
phase json type fix
stan-donarise Jul 2, 2023
4b33fab
plotly css (shadow dom)
stan-donarise Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/mpds_visavis.yml
View file
Open in desktop
Expand Up @@ -16,10 +16,10 @@ jobs:

- uses: hyoo-ru/mam_build@master2
with:
package: 'visavis'
package: 'mpds/visavis'
modules: 'app'

- uses: JamesIves/github-pages-deploy-action@4.1.7
with:
branch: gh-pages
folder: 'visavis/app/-'
folder: 'mpds/visavis/app/-'
2 changes: 1 addition & 1 deletion app/app.meta.tree
View file
Open in desktop
@@ -1 +1 @@
deploy \/visavis/examples/bar_sci_literature.json
deploy \/mpds/visavis/examples/bar_sci_literature.json
12 changes: 11 additions & 1 deletion app/app.view.css.ts
View file
Open in desktop
@@ -1,6 +1,13 @@
namespace $.$$ {

$mol_style_define( $.$visavis_app, {
$mol_style_define( $.$mpds_visavis_app, {

Plot_view: {
flex: {
direction: 'column',
},
height: '100%',
},

Start_page: {
'@': {
Expand Down Expand Up @@ -100,6 +107,9 @@ namespace $.$$ {
flex: {
grow: 1,
},
Body: {
contain: 'none', //otherwise plot position 'fixed' doesn't work (for fullscreen)
},
},

} )
Expand Down
5 changes: 3 additions & 2 deletions app/app.view.tree
View file
Open in desktop
@@ -1,4 +1,4 @@
$visavis_app $mol_book2
$mpds_visavis_app $mol_book2
attr * mol_theme \$mol_theme_light
title \Vis-a-vis
Placeholder null
Expand Down Expand Up @@ -63,5 +63,6 @@ $visavis_app $mol_book2
Plot_page* $mol_page
title <= plot_id* \
body /
<= Plot_view* $visavis_plot
<= Plot_view* $mpds_visavis_plot
plot_raw <= plot_raw* null
show_setup true
16 changes: 9 additions & 7 deletions app/app.view.ts
View file
Open in desktop
@@ -1,12 +1,12 @@
namespace $.$$ {

export class $visavis_app extends $.$visavis_app {
export class $mpds_visavis_app extends $.$mpds_visavis_app {

@ $mol_action
files_read(next: readonly File[]) {
const data = $mol_wire_sync( $mol_blob_json )( next[0] )

const plot_raw = $visavis_plot_raw_from_json( data, next[0].name )
const plot_raw = $mpds_visavis_plot_raw_from_json( data, next[0].name )

this.plot_opened_id( this.history_add( plot_raw ) )
}
Expand All @@ -17,7 +17,7 @@ namespace $.$$ {
}

@ $mol_action
history_add(plot_raw: $visavis_plot_raw) {
history_add(plot_raw: $mpds_visavis_plot_raw) {
const duplicates = this.history_plot_ids().filter( id => id.replace(/\[\d+?\]/, '') === plot_raw.id() )
const count = Math.max( ... duplicates.map( id => Number( id.match(/\[(\d+?)\]$/)?.[1] ?? 0 ) ) )
const postfix = duplicates.length ? `[${ count + 1 }]` : ''
Expand All @@ -43,9 +43,9 @@ namespace $.$$ {
}

@ $mol_mem_key
plot_raw(id: string, next?: $visavis_plot_raw | null) {
plot_raw(id: string, next?: $mpds_visavis_plot_raw | null) {
const json = this.$.$mol_state_local.value( `${this}.plot_raw('${id}')` , next && next.data() )
return json ? new $visavis_plot_raw( json ) : null
return json ? new $mpds_visavis_plot_raw( json ) : null
}

@ $mol_mem
Expand All @@ -58,8 +58,8 @@ namespace $.$$ {
const names = [ 'bar_sci_literature.json' ]

return names.map( name => {
const json = $mol_fetch.json( '/visavis/examples/' + name )
const plot_raw = $visavis_plot_raw_from_json( json, name )
const json = $mol_fetch.json( '/mpds/visavis/examples/' + name )
const plot_raw = $mpds_visavis_plot_raw_from_json( json, name )

this.plot_raw( plot_raw.id(), plot_raw )

Expand Down Expand Up @@ -115,4 +115,6 @@ namespace $.$$ {

}

$mol_view_component( $mpds_visavis_app )

}
2 changes: 1 addition & 1 deletion app/index.html
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
</head>
<body mol_view_root>
<div mol_view_root="$visavis_app"></div>
<div mol_view_root="$mpds_visavis_app"></div>
<script src="web.js" charset="utf-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions elements/list/list.meta.tree
View file
Open in desktop
@@ -1,2 +1,2 @@
deploy \/visavis/elements/data/elements.json.tree
deploy \/visavis/elements/data/prop_names.json.tree
deploy \/mpds/visavis/elements/data/elements.json.tree
deploy \/mpds/visavis/elements/data/prop_names.json.tree