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

Fixed: identifier IpyVizzu has already been declared (e.g. in Kaggle shared notebooks) #278

Merged
merged 5 commits into from
Oct 12, 2023
Merged

Fixed: identifier IpyVizzu has already been declared (e.g. in Kaggle shared notebooks) #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c59a73
Fix identifier 'IpyVizzu' has already been declared
veghdev Oct 12, 2023
217286a
Fix version check
veghdev Oct 12, 2023
3057e31
Test version replacement
veghdev Oct 12, 2023
b241ec6
Fix formatting and versioning
veghdev Oct 12, 2023
47c7a25
Restore version
veghdev Oct 12, 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
2 changes: 1 addition & 1 deletion src/ipyvizzu/chart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def initializing(self) -> None:
def _display_ipyvizzujs(self) -> None:
ipyvizzurawjs = pkgutil.get_data(__name__, "templates/ipyvizzu.js")
ipyvizzujs = ipyvizzurawjs.decode("utf-8").replace( # type: ignore
'"__version__"', f'"{__version__}"'
"'__version__'", f"'{__version__}'"
)
self._display(DisplayTemplate.IPYVIZZUJS.format(ipyvizzujs=ipyvizzujs))

Expand Down
334 changes: 167 additions & 167 deletions src/ipyvizzu/templates/ipyvizzu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,196 +1,196 @@
class IpyVizzu {
static version = '__version__'
static analytics = undefined
static inhibitScroll = false

constructor() {
document.addEventListener(
'wheel',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)
document.addEventListener(
'keydown',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)
document.addEventListener(
'touchstart',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)

this.elements = {}
this.charts = {}
this.controls = {}

this.storage = {}
this.displays = {}

this.events = {}
this.loaded = {}
this.libs = {}
}
if (window.IpyVizzu?.version !== '__version__') {
class IpyVizzu {
static version = '__version__'
static analytics = undefined
static inhibitScroll = false

constructor() {
document.addEventListener(
'wheel',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)
document.addEventListener(
'keydown',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)
document.addEventListener(
'touchstart',
(evt) => {
IpyVizzu.inhibitScroll = true
},
true
)

this.elements = {}
this.charts = {}
this.controls = {}

this.storage = {}
this.displays = {}

this.events = {}
this.loaded = {}
this.libs = {}
}

static clearInhibitScroll(element) {
IpyVizzu.inhibitScroll = false
}
static clearInhibitScroll(element) {
IpyVizzu.inhibitScroll = false
}

createChart(element, chartId, vizzulib, divWidth, divHeight) {
this.elements[chartId] = document.createElement('div')
this.elements[chartId].style.cssText = `width: ${divWidth}; height: ${divHeight};`
this.loaded[chartId] = import(vizzulib)
this.charts[chartId] = this.loaded[chartId].then((Vizzu) => {
this.libs[chartId] = Vizzu.default
const VizzuConstructor = Vizzu.default
return new VizzuConstructor(this.elements[chartId]).initializing
})
this._moveHere(chartId, element)
}
createChart(element, chartId, vizzulib, divWidth, divHeight) {
this.elements[chartId] = document.createElement('div')
this.elements[chartId].style.cssText = `width: ${divWidth}; height: ${divHeight};`
this.loaded[chartId] = import(vizzulib)
this.charts[chartId] = this.loaded[chartId].then((Vizzu) => {
this.libs[chartId] = Vizzu.default
const VizzuConstructor = Vizzu.default
return new VizzuConstructor(this.elements[chartId]).initializing
})
this._moveHere(chartId, element)
}

animate(element, chartId, animId, displayTarget, scrollEnabled, getChartTarget, chartAnimOpts) {
if (displayTarget === 'end') this._moveHere(chartId, element)
this.controls[chartId] = this.charts[chartId]
this.charts[chartId] = this.charts[chartId].then((chart) => {
if (displayTarget === 'actual') this._moveHere(chartId, element)
this._scroll(chartId, scrollEnabled)
let chartTarget = getChartTarget(this.libs[chartId])
if (typeof chartTarget === 'string') {
chartTarget = this.storage[chartTarget]
} else if (Array.isArray(chartTarget)) {
for (let i = 0; i < chartTarget.length; i++) {
const target = chartTarget[i].target
if (typeof target === 'string') {
chartTarget[i].target = this.storage[target]
animate(element, chartId, animId, displayTarget, scrollEnabled, getChartTarget, chartAnimOpts) {
if (displayTarget === 'end') this._moveHere(chartId, element)
this.controls[chartId] = this.charts[chartId]
this.charts[chartId] = this.charts[chartId].then((chart) => {
if (displayTarget === 'actual') this._moveHere(chartId, element)
this._scroll(chartId, scrollEnabled)
let chartTarget = getChartTarget(this.libs[chartId])
if (typeof chartTarget === 'string') {
chartTarget = this.storage[chartTarget]
} else if (Array.isArray(chartTarget)) {
for (let i = 0; i < chartTarget.length; i++) {
const target = chartTarget[i].target
if (typeof target === 'string') {
chartTarget[i].target = this.storage[target]
}
}
}
}
chart = chart.animate(chartTarget, chartAnimOpts)
this.controls[animId] = chart
return chart
})
}

store(element, chartId, id) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
this.storage[id] = chart.store()
return chart
})
}

feature(element, chartId, name, enabled) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
chart.feature(name, enabled)
return chart
})
}
chart = chart.animate(chartTarget, chartAnimOpts)
this.controls[animId] = chart
return chart
})
}

setEvent(element, chartId, id, event, handler) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
this.events[id] = handler
chart.on(event, this.events[id])
return chart
})
}
store(element, chartId, id) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
this.storage[id] = chart.store()
return chart
})
}

clearEvent(element, chartId, id, event) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
chart.off(event, this.events[id])
return chart
})
}
feature(element, chartId, name, enabled) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
chart.feature(name, enabled)
return chart
})
}

log(element, chartId, chartProperty) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
console.log(chart[chartProperty])
return chart
})
}
setEvent(element, chartId, id, event, handler) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
this.events[id] = handler
chart.on(event, this.events[id])
return chart
})
}

control(element, method, prevId, lastId, ...params) {
this.controls[prevId].then(() => {
this.controls[lastId].activated.then((control) => {
if (method === 'seek') {
const value = params[0]
control[method](value)
return
}
if (method === 'store') {
const id = params[0]
this.storage[id] = control[method]()
return
}
control[method]()
clearEvent(element, chartId, id, event) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
chart.off(event, this.events[id])
return chart
})
})
}
}

_moveHere(chartId, element) {
element.append(this.elements[chartId])
}
log(element, chartId, chartProperty) {
this.charts[chartId] = this.charts[chartId].then((chart) => {
console.log(chart[chartProperty])
return chart
})
}

_scroll(chartId, enabled) {
if (!IpyVizzu.inhibitScroll && enabled) {
this.elements[chartId].scrollIntoView({
behavior: 'auto',
block: 'center'
control(element, method, prevId, lastId, ...params) {
this.controls[prevId].then(() => {
this.controls[lastId].activated.then((control) => {
if (method === 'seek') {
const value = params[0]
control[method](value)
return
}
if (method === 'store') {
const id = params[0]
this.storage[id] = control[method]()
return
}
control[method]()
})
})
}
}

static _hide(element) {
document.getElementById(element.selector.substring(1)).parentNode.style.display = 'none'
}
_moveHere(chartId, element) {
element.append(this.elements[chartId])
}

static _display(prevElement, element) {
if (prevElement.parentNode) {
prevElement.parentNode.style.display = 'none'
_scroll(chartId, enabled) {
if (!IpyVizzu.inhibitScroll && enabled) {
this.elements[chartId].scrollIntoView({
behavior: 'auto',
block: 'center'
})
}
}
document.getElementById(element.selector.substring(1)).parentNode.style.display = 'flex'
document.getElementById(element.selector.substring(1)).parentNode.style.margin = 'auto'
}

static changeAnalyticsTo(analytics) {
if (IpyVizzu.analytics !== analytics) {
console.log('ipyvizzu gather usage stats:', analytics)
IpyVizzu.analytics = analytics
static _hide(element) {
document.getElementById(element.selector.substring(1)).parentNode.style.display = 'none'
}
if (analytics) {
IpyVizzu._addHeadScript()
} else {
IpyVizzu._removeScript('ipyvizzu-analytics-head')

static _display(prevElement, element) {
if (prevElement.parentNode) {
prevElement.parentNode.style.display = 'none'
}
document.getElementById(element.selector.substring(1)).parentNode.style.display = 'flex'
document.getElementById(element.selector.substring(1)).parentNode.style.margin = 'auto'
}
}

static _addHeadScript() {
const scriptId = 'ipyvizzu-analytics-head'
if (!IpyVizzu._isScriptAppended(scriptId)) {
const script = document.createElement('script')
script.defer = true
script.src = 'https://plausible.io/js/script.local.js'
script.dataset.domain = 'usage.ipyvizzu.com'
script.id = scriptId
document.getElementsByTagName('head')[0].appendChild(script)
static changeAnalyticsTo(analytics) {
if (IpyVizzu.analytics !== analytics) {
console.log('ipyvizzu gather usage stats:', analytics)
IpyVizzu.analytics = analytics
}
if (analytics) {
IpyVizzu._addHeadScript()
} else {
IpyVizzu._removeScript('ipyvizzu-analytics-head')
}
}
}

static _isScriptAppended(id) {
return document.querySelector(`script[id="${id}"]`) !== null
}
static _addHeadScript() {
const scriptId = 'ipyvizzu-analytics-head'
if (!IpyVizzu._isScriptAppended(scriptId)) {
const script = document.createElement('script')
script.defer = true
script.src = 'https://plausible.io/js/script.local.js'
script.dataset.domain = 'usage.ipyvizzu.com'
script.id = scriptId
document.getElementsByTagName('head')[0].appendChild(script)
}
}

static _isScriptAppended(id) {
return document.querySelector(`script[id="${id}"]`) !== null
}

static _removeScript(id) {
const script = document.getElementById(id)
if (script) script.remove()
static _removeScript(id) {
const script = document.getElementById(id)
if (script) script.remove()
}
}
}

if (IpyVizzu.version !== window.IpyVizzu?.version) {
window.IpyVizzu = IpyVizzu
console.log(`ipyvizzu ${IpyVizzu.version}`)
window.ipyvizzu = new window.IpyVizzu()
Expand Down