@websy/websy-designs 1.3.5 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/server/helpers/v1/pgHelper.js +2 -2
  2. package/dist/websy-designs-es6.debug.js +164 -25
  3. package/dist/websy-designs-es6.js +71 -22
  4. package/dist/websy-designs-es6.min.js +1 -1
  5. package/dist/websy-designs.debug.js +164 -25
  6. package/dist/websy-designs.js +71 -22
  7. package/dist/websy-designs.min.css +1 -1
  8. package/dist/websy-designs.min.js +1 -1
  9. package/package.json +1 -1
package/dist/server/helpers/v1/pgHelper.js CHANGED
@@ -48,9 +48,9 @@ const sql = {
48
48
  )
49
49
  WITH (OIDS=FALSE);
50
50
 
51
- ALTER TABLE "session" ADD CONSTRAINT "session_pkey" PRIMARY KEY ("sid") NOT DEFERRABLE INITIALLY IMMEDIATE;
51
+ ALTER TABLE "sessions" ADD CONSTRAINT "session_pkey" PRIMARY KEY ("sid") NOT DEFERRABLE INITIALLY IMMEDIATE;
52
52
 
53
- CREATE INDEX "IDX_session_expire" ON "session" ("expire");
53
+ CREATE INDEX "IDX_session_expire" ON "sessions" ("expire");
54
54
  `,
55
55
  users: `
56
56
  CREATE TABLE users (
package/dist/websy-designs-es6.debug.js CHANGED
@@ -1412,9 +1412,9 @@ class WebsyDropdown {
1412
1412
  showCompleteSelectedList: false,
1413
1413
  closeAfterSelection: true,
1414
1414
  customActions: [],
1415
- searchIcon: `<svg class='search' width="20" height="20" viewBox="0 0 512 512"><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>`,
1416
- clearIcon: `<svg class='clear' xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 512 512"><title>ionicons-v5-l</title><line x1="368" y1="368" x2="144" y2="144" style="fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="368" y1="144" x2="144" y2="368" style="fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>`,
1417
- arrowIcon: `<svg class='arrow' xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z"/></svg>`,
1415
+ searchIcon: `<svg width="20" height="20" viewBox="0 0 512 512"><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>`,
1416
+ clearIcon: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 512 512"><title>ionicons-v5-l</title><line x1="368" y1="368" x2="144" y2="144" style="fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="368" y1="144" x2="144" y2="368" style="fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>`,
1417
+ arrowIcon: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z"/></svg>`,
1418
1418
  actionsIcon: `<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 512 512">><circle cx="256" cy="256" r="32" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><circle cx="416" cy="256" r="32" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><circle cx="96" cy="256" r="32" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/></svg>`
1419
1419
  }
1420
1420
  this.options = Object.assign({}, DEFAULTS, options)
@@ -1443,16 +1443,20 @@ class WebsyDropdown {
1443
1443
  let html = `
1444
1444
  <div id='${this.elementId}_container' class='websy-dropdown-container ${this.options.disabled ? 'disabled' : ''} ${this.options.disableSearch !== true ? 'with-search' : ''} ${this.options.style} ${this.options.customActions.length > 0 ? 'with-actions' : ''}'>
1445
1445
  <div id='${this.elementId}_header' class='websy-dropdown-header ${this.selectedItems.length === 1 ? 'one-selected' : ''} ${this.options.allowClear === true ? 'allow-clear' : ''}'>
1446
- ${this.options.searchIcon}
1447
- <span>
1446
+ `
1447
+ if (this.options.disableSearch !== true) {
1448
+ html += `<div class='search'>${this.options.searchIcon}</div>`
1449
+ }
1450
+ html += `
1451
+ <div class='header-label'>
1448
1452
  <span class='websy-dropdown-header-value' data-info='${headerLabel}' id='${this.elementId}_selectedItems'>${headerLabel}</span>
1449
1453
  <span class='websy-dropdown-header-label' id='${this.elementId}_headerLabel'>${this.options.label}</span>
1450
- </span>
1454
+ </div>
1451
1455
  <input class='dropdown-input' id='${this.elementId}_input' name='${this.options.field || this.options.label}' value='${headerValue}'>
1452
- ${this.options.arrowIcon}
1456
+ <div class='arrow'>${this.options.arrowIcon}</div>
1453
1457
  `
1454
1458
  if (this.options.allowClear === true) {
1455
- html += this.options.clearIcon
1459
+ html += `<div class='clear'>${this.options.clearIcon}</div>`
1456
1460
  }
1457
1461
  html += `
1458
1462
  </div>
@@ -2139,7 +2143,7 @@ const WebsyIcons = {
2139
2143
  `,
2140
2144
  'bag-icon': `
2141
2145
  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
2142
- viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2146
+ viewBox="0 0 500 500">
2143
2147
  <path d="M456.6,472.3H43.4c-5.3,0-10.2-2.1-13.7-6c-3.6-3.9-5.2-9.2-4.5-14.4l37-285.4c1.2-9,9-15.9,18.2-15.9h339.2
2144
2148
  c9.2,0,17,6.8,18.2,15.8l37,285.4c0.7,5.2-1,10.5-4.5,14.4l0,0C466.8,470.1,461.9,472.3,456.6,472.3z M46.5,451.2h407l-36.3-279.6
2145
2149
  H82.8L46.5,451.2z"/>
@@ -2162,6 +2166,104 @@ const WebsyIcons = {
2162
2166
  c0-62.9-23.4-122-65.9-166.5c-42.5-44.5-99-69-159.1-69s-116.6,24.5-159.1,69C48.4,353,25,412.1,25,475c0,0,0,0,0,0H45z"/>
2163
2167
  </svg>
2164
2168
 
2169
+ `,
2170
+ 'Search': `
2171
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
2172
+ viewBox="0 0 500 500" xml:space="preserve">
2173
+ <path d="M481.4,468.6c-17.2-17.2-34.4-34.4-51.6-51.6c-27.4-27.4-54.8-54.8-82.2-82.2c-4.8-4.8-9.5-9.5-14.3-14.3
2174
+ c29.4-32.5,47.4-75.5,47.4-122.7C380.7,97,298.7,15,197.9,15S15,97,15,197.9s82,182.9,182.9,182.9c47.2,0,90.3-18,122.7-47.4
2175
+ c15.7,15.7,31.4,31.4,47.1,47.1c27.4,27.4,54.8,54.8,82.2,82.2c6.3,6.3,12.5,12.5,18.8,18.8C476.8,489.6,489.6,476.8,481.4,468.6z
2176
+ M35,197.9C35,108.1,108.1,35,197.9,35s162.9,73.1,162.9,162.9s-73.1,162.9-162.9,162.9S35,287.7,35,197.9z"/>
2177
+ </svg>
2178
+
2179
+ `,
2180
+ 'Bag': `
2181
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
2182
+ viewBox="0 0 500 500">
2183
+ <path d="M456.6,472.3H43.4c-5.3,0-10.2-2.1-13.7-6c-3.6-3.9-5.2-9.2-4.5-14.4l37-285.4c1.2-9,9-15.9,18.2-15.9h339.2
2184
+ c9.2,0,17,6.8,18.2,15.8l37,285.4c0.7,5.2-1,10.5-4.5,14.4l0,0C466.8,470.1,461.9,472.3,456.6,472.3z M46.5,451.2h407l-36.3-279.6
2185
+ H82.8L46.5,451.2z"/>
2186
+ <g>
2187
+ <path d="M361.3,157.1C357.3,94.8,308.4,46,249.9,46c-28,0-54.8,11.1-75.4,31.4c-20.7,20.3-33.5,47.9-35.9,77.8l-21.5-1.6
2188
+ c2.8-34.8,17.7-67.1,42.1-91C183.9,38.3,216.1,25,249.9,25c34.2,0,66.6,13.6,91.5,38.3c24.5,24.3,39.2,57.2,41.5,92.5L361.3,157.1z
2189
+ "/>
2190
+ </g>
2191
+ </svg>
2192
+
2193
+ `,
2194
+ 'User': `
2195
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
2196
+ viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2197
+ <g>
2198
+ <path d="M248,260.5c-62,0-112.5-52.8-112.5-117.7S186,25,248,25s112.5,52.8,112.5,117.7S310,260.5,248,260.5z M248,45.9
2199
+ c-51,0-92.5,43.4-92.5,96.8s41.5,96.8,92.5,96.8c51,0,92.5-43.4,92.5-96.8S299,45.9,248,45.9z"/>
2200
+ </g>
2201
+ <path d="M45,475C45,475,45,475,45,475c0-118.3,92-214.5,205-214.5c113,0,205,96.2,205,214.5c0,0,0,0,0,0h20c0,0,0,0,0,0
2202
+ c0-62.9-23.4-122-65.9-166.5c-42.5-44.5-99-69-159.1-69s-116.6,24.5-159.1,69C48.4,353,25,412.1,25,475c0,0,0,0,0,0H45z"/>
2203
+ </svg>
2204
+
2205
+ `,
2206
+ 'DockLeft': `
2207
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
2208
+ viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2209
+ <g>
2210
+ <path d="M419.7,425H80.3C49.8,425,25,400.2,25,369.7V130.3C25,99.8,49.8,75,80.3,75h339.4c30.5,0,55.3,24.8,55.3,55.3v239.4
2211
+ C475,400.2,450.2,425,419.7,425z M80.3,95C60.8,95,45,110.8,45,130.3v239.4c0,19.5,15.8,35.3,35.3,35.3h339.4
2212
+ c19.5,0,35.3-15.8,35.3-35.3V130.3c0-19.5-15.8-35.3-35.3-35.3H80.3z"/>
2213
+ </g>
2214
+ <path d="M92.8,90.1H92h-4.2c-24.8,0-45,20.2-45,45v229.8c0,24.8,20.2,45,45,45H92h0.8h105.4V90.1H92.8z"/>
2215
+ </svg>
2216
+
2217
+ `,
2218
+ 'DockRight': `
2219
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
2220
+ viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2221
+ <g>
2222
+ <path d="M25,369.7V130.3C25,99.8,49.8,75,80.3,75h339.4c30.5,0,55.3,24.8,55.3,55.3v239.4c0,30.5-24.8,55.3-55.3,55.3H80.3
2223
+ C49.8,425,25,400.2,25,369.7z M80.3,95C60.8,95,45,110.8,45,130.3v239.4c0,19.5,15.8,35.3,35.3,35.3h339.4
2224
+ c19.5,0,35.3-15.8,35.3-35.3V130.3c0-19.5-15.8-35.3-35.3-35.3H80.3z"/>
2225
+ </g>
2226
+ <path d="M407.2,90.1h0.8h4.2c24.8,0,45,20.2,45,45v229.8c0,24.8-20.2,45-45,45H408h-0.8H301.8V90.1H407.2z"/>
2227
+ </svg>
2228
+
2229
+ `,
2230
+ 'Pin': `
2231
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
2232
+ viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2233
+ <g>
2234
+ <path d="M368,312.1H132l-0.6-9.4c-0.1-2.4-0.2-4.8-0.2-7.1c0-40.3,20.7-78.1,54.4-99.9V73.2h-9c-13,0-23.6-10.6-23.6-23.6
2235
+ S163.5,26,176.6,26h146.9c13,0,23.6,10.6,23.6,23.6s-10.6,23.6-23.6,23.6h-9v122.5c33.7,21.8,54.4,59.5,54.4,99.9
2236
+ c0,2.3-0.1,4.7-0.2,7.1L368,312.1z M151.2,292.1h197.5c-1.2-33.8-19.9-65.1-49.4-82.1l-5-2.9V53.2h29c2,0,3.6-1.6,3.6-3.6
2237
+ c0-2-1.6-3.6-3.6-3.6H176.6c-2,0-3.6,1.6-3.6,3.6c0,2,1.6,3.6,3.6,3.6h29v153.9l-5,2.9C171.1,227,152.4,258.3,151.2,292.1z"/>
2238
+ </g>
2239
+ <path d="M260.9,403.8V299.9h-21.8v108.8h0c0.1,36.1,4.9,65.3,10.9,65.3c6,0,10.9-29.7,10.9-66.4
2240
+ C260.9,406.4,260.9,405.1,260.9,403.8z"/>
2241
+ </svg>
2242
+
2243
+ `,
2244
+ 'WindowPopout': `
2245
+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
2246
+ viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
2247
+ <style type="text/css">
2248
+ .st0{fill:none;stroke:#000000;stroke-width:20;stroke-miterlimit:10;}
2249
+ </style>
2250
+ <path class="st0" d="M420.1,359.6h-285c-24.7,0-45-20.2-45-45V124.9c0-24.7,20.2-45,45-45h285c24.7,0,45,20.2,45,45v189.7
2251
+ C465.1,339.3,444.9,359.6,420.1,359.6z"/>
2252
+ <path class="st0" d="M407.3,389.8c-6.3,17.3-22.9,29.7-42.3,29.7H80c-24.7,0-45-20.2-45-45V184.9c0-18.2,10.9-33.9,26.5-41"/>
2253
+ </svg>
2254
+
2255
+ `,
2256
+ 'Plus': `
2257
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500">
2258
+ <path d="M254.7,486h-10.3c-5.5,0-10-4.5-10-10V26c0-5.5,4.5-10,10-10h10.3c5.5,0,10,4.5,10,10v450C264.6,481.5,260.2,486,254.7,486z"/>
2259
+ <path d="M15,255.1v-10.3c0-5.5,4.5-10,10-10h450c5.5,0,10,4.5,10,10v10.3c0,5.5-4.5,10-10,10H25C19.5,265.1,15,260.7,15,255.1z"/>
2260
+ </svg>
2261
+
2262
+ `,
2263
+ 'Minus': `
2264
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500">
2265
+ <path d="M15,255.1v-10.3c0-5.5,4.5-10,10-10h450c5.5,0,10,4.5,10,10v10.3c0,5.5-4.5,10-10,10H25C19.5,265.1,15,260.7,15,255.1z"/>
2266
+ </svg>
2165
2267
  `
2166
2268
  }
2167
2269
 
@@ -3716,7 +3818,7 @@ class WebsyRouter {
3716
3818
  this.showComponents(view)
3717
3819
  this.publish('show', [view, params, group])
3718
3820
  }
3719
- if (this.previousView === this.currentView && this.previousParams.path !== this.currentParams.path) {
3821
+ else if (this.previousView === this.currentView && this.previousParams.path !== this.currentParams.path) {
3720
3822
  this.showComponents(view)
3721
3823
  this.publish('show', [view, params, group])
3722
3824
  }
@@ -3818,13 +3920,7 @@ class WebsyRouter {
3818
3920
  }
3819
3921
  if (toggle === true && newPath === groupActiveView) {
3820
3922
  return
3821
- }
3822
- if (toggle === false) {
3823
- this.showView(this.currentView, this.currentParams, group)
3824
- }
3825
- else if (newPath && newPath !== '') {
3826
- this.showView(newPath, null, group)
3827
- }
3923
+ }
3828
3924
  if (this.usesHTMLSuffix === true) {
3829
3925
  inputPath = window.location.pathname.split('/').pop() + inputPath
3830
3926
  }
@@ -3851,6 +3947,12 @@ class WebsyRouter {
3851
3947
  //
3852
3948
  }
3853
3949
  }
3950
+ if (toggle === false) {
3951
+ this.showView(this.currentView, this.currentParams, group)
3952
+ }
3953
+ else if (newPath && newPath !== '') {
3954
+ this.showView(newPath, null, group)
3955
+ }
3854
3956
  }
3855
3957
  on (event, fn) {
3856
3958
  this.options.subscribers[event].push(fn)
@@ -5416,7 +5518,7 @@ class WebsyTable3 {
5416
5518
  `).join('')
5417
5519
  bodyHtml += '</colgroup>'
5418
5520
  }
5419
- data.forEach(row => {
5521
+ data.forEach((row, rowIndex) => {
5420
5522
  bodyHtml += `<tr class="websy-table-row">`
5421
5523
  row.forEach((cell, cellIndex) => {
5422
5524
  if (typeof sizingColumns[cellIndex] === 'undefined') {
@@ -5445,6 +5547,8 @@ class WebsyTable3 {
5445
5547
  data-info='${cell.value}'
5446
5548
  colspan='${cell.colspan || 1}'
5447
5549
  rowspan='${cell.rowspan || 1}'
5550
+ data-row-index='${rowIndex}'
5551
+ data-col-index='${cellIndex}'
5448
5552
  `
5449
5553
  // if (useWidths === true) {
5450
5554
  // bodyHtml += `
@@ -5453,7 +5557,22 @@ class WebsyTable3 {
5453
5557
  // `
5454
5558
  // }
5455
5559
  bodyHtml += `
5456
- >
5560
+ >`
5561
+ if (cell.expandable === true) {
5562
+ bodyHtml += `<i
5563
+ data-row-index='${rowIndex}'
5564
+ data-col-index='${cellIndex}'
5565
+ class='websy-table-cell-expand'
5566
+ >${WebsyDesigns.Icons.Plus}</i>`
5567
+ }
5568
+ if (cell.collapsable === true) {
5569
+ bodyHtml += `<i
5570
+ data-row-index='${rowIndex}'
5571
+ data-col-index='${cellIndex}'
5572
+ class='websy-table-cell-collapse'
5573
+ >${WebsyDesigns.Icons.Minus}</i>`
5574
+ }
5575
+ bodyHtml += `
5457
5576
  ${cell.value}
5458
5577
  </td>`
5459
5578
  })
@@ -5671,13 +5790,30 @@ class WebsyTable3 {
5671
5790
  return output
5672
5791
  }
5673
5792
  handleClick (event) {
5793
+ const colIndex = +event.target.getAttribute('data-col-index')
5794
+ const rowIndex = +event.target.getAttribute('data-row-index')
5674
5795
  if (event.target.classList.contains('websy-table-search-icon')) {
5675
- console.log('clicked on search icon')
5676
- const colIndex = +event.target.getAttribute('data-col-index')
5796
+ console.log('clicked on search icon')
5677
5797
  if (this.options.columns[this.options.columns.length - 1][colIndex].onSearch) {
5678
5798
  this.options.columns[this.options.columns.length - 1][colIndex].onSearch(event, this.options.columns[this.options.columns.length - 1][colIndex])
5679
5799
  }
5680
5800
  }
5801
+ if (event.target.classList.contains('websy-table-cell-collapse')) {
5802
+ if (this.options.onCollapseCell) {
5803
+ this.options.onCollapseCell(event, +rowIndex, +colIndex)
5804
+ }
5805
+ else {
5806
+ // out of box function
5807
+ }
5808
+ }
5809
+ if (event.target.classList.contains('websy-table-cell-expand')) {
5810
+ if (this.options.onExpandCell) {
5811
+ this.options.onExpandCell(event, +rowIndex, +colIndex)
5812
+ }
5813
+ else {
5814
+ // out of box function
5815
+ }
5816
+ }
5681
5817
  }
5682
5818
  handleMouseDown (event) {
5683
5819
  if (event.target.classList.contains('websy-scroll-handle-y')) {
@@ -6382,6 +6518,9 @@ else {
6382
6518
  this.longestBottom = this.options.data.bottom.max.toString()
6383
6519
  if (this.options.data.bottom.formatter) {
6384
6520
  this.longestBottom = this.options.data.bottom.formatter(this.options.data.bottom.max).toString()
6521
+ }
6522
+ else {
6523
+ this.longestBottom = '01/01/2000'
6385
6524
  }
6386
6525
  }
6387
6526
  if (this.options.data.left && this.options.data.left.data && this.options.data.left.max === 'undefined') {
@@ -6897,8 +7036,8 @@ if (this.options.showLabels === true || series.showLabels === true) {
6897
7036
  .style('stroke-opacity', 1e-6)
6898
7037
  .remove()
6899
7038
  labels
6900
- .attr('x', getLabelX.bind(this))
6901
- .attr('y', getLabelY.bind(this))
7039
+ .attr('x', d => getLabelX.call(this, d, series.labelPosition))
7040
+ .attr('y', d => getLabelY.call(this, d, series.labelPosition))
6902
7041
  .attr('class', `label_${series.key}`)
6903
7042
  .attr('fill', d => this.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
6904
7043
  .style('font-size', `${this.options.labelSize || this.options.fontSize}px`)
@@ -6934,8 +7073,8 @@ if (this.options.showLabels === true || series.showLabels === true) {
6934
7073
  .enter()
6935
7074
  .append('text')
6936
7075
  .attr('class', `label_${series.key}`)
6937
- .attr('x', getLabelX.bind(this))
6938
- .attr('y', getLabelY.bind(this))
7076
+ .attr('x', d => getLabelX.call(this, d, series.labelPosition))
7077
+ .attr('y', d => getLabelY.call(this, d, series.labelPosition))
6939
7078
  .attr('alignment-baseline', 'central')
6940
7079
  .attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle')
6941
7080
  .attr('fill', d => this.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
package/dist/websy-designs-es6.js CHANGED
@@ -1590,9 +1590,9 @@ var WebsyDropdown = /*#__PURE__*/function () {
1590
1590
  showCompleteSelectedList: false,
1591
1591
  closeAfterSelection: true,
1592
1592
  customActions: [],
1593
- searchIcon: "<svg class='search' width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>",
1594
- clearIcon: "<svg class='clear' xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><title>ionicons-v5-l</title><line x1=\"368\" y1=\"368\" x2=\"144\" y2=\"144\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/><line x1=\"368\" y1=\"144\" x2=\"144\" y2=\"368\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/></svg>",
1595
- arrowIcon: "<svg class='arrow' xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path d=\"M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z\"/></svg>",
1593
+ searchIcon: "<svg width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>",
1594
+ clearIcon: "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><title>ionicons-v5-l</title><line x1=\"368\" y1=\"368\" x2=\"144\" y2=\"144\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/><line x1=\"368\" y1=\"144\" x2=\"144\" y2=\"368\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/></svg>",
1595
+ arrowIcon: "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path d=\"M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z\"/></svg>",
1596
1596
  actionsIcon: "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"30\" height=\"30\" viewBox=\"0 0 512 512\">><circle cx=\"256\" cy=\"256\" r=\"32\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><circle cx=\"416\" cy=\"256\" r=\"32\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><circle cx=\"96\" cy=\"256\" r=\"32\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/></svg>"
1597
1597
  };
1598
1598
  this.options = _extends({}, DEFAULTS, options);
@@ -1627,10 +1627,16 @@ var WebsyDropdown = /*#__PURE__*/function () {
1627
1627
  var headerValue = this.selectedItems.map(function (s) {
1628
1628
  return _this9.options.items[s].value || _this9.options.items[s].label;
1629
1629
  }).join(this.options.multiValueDelimiter);
1630
- var html = "\n <div id='".concat(this.elementId, "_container' class='websy-dropdown-container ").concat(this.options.disabled ? 'disabled' : '', " ").concat(this.options.disableSearch !== true ? 'with-search' : '', " ").concat(this.options.style, " ").concat(this.options.customActions.length > 0 ? 'with-actions' : '', "'>\n <div id='").concat(this.elementId, "_header' class='websy-dropdown-header ").concat(this.selectedItems.length === 1 ? 'one-selected' : '', " ").concat(this.options.allowClear === true ? 'allow-clear' : '', "'>\n ").concat(this.options.searchIcon, "\n <span>\n <span class='websy-dropdown-header-value' data-info='").concat(headerLabel, "' id='").concat(this.elementId, "_selectedItems'>").concat(headerLabel, "</span> \n <span class='websy-dropdown-header-label' id='").concat(this.elementId, "_headerLabel'>").concat(this.options.label, "</span>\n </span>\n <input class='dropdown-input' id='").concat(this.elementId, "_input' name='").concat(this.options.field || this.options.label, "' value='").concat(headerValue, "'>\n ").concat(this.options.arrowIcon, "\n ");
1630
+ var html = "\n <div id='".concat(this.elementId, "_container' class='websy-dropdown-container ").concat(this.options.disabled ? 'disabled' : '', " ").concat(this.options.disableSearch !== true ? 'with-search' : '', " ").concat(this.options.style, " ").concat(this.options.customActions.length > 0 ? 'with-actions' : '', "'>\n <div id='").concat(this.elementId, "_header' class='websy-dropdown-header ").concat(this.selectedItems.length === 1 ? 'one-selected' : '', " ").concat(this.options.allowClear === true ? 'allow-clear' : '', "'>\n ");
1631
+
1632
+ if (this.options.disableSearch !== true) {
1633
+ html += "<div class='search'>".concat(this.options.searchIcon, "</div>");
1634
+ }
1635
+
1636
+ html += "\n <div class='header-label'>\n <span class='websy-dropdown-header-value' data-info='".concat(headerLabel, "' id='").concat(this.elementId, "_selectedItems'>").concat(headerLabel, "</span> \n <span class='websy-dropdown-header-label' id='").concat(this.elementId, "_headerLabel'>").concat(this.options.label, "</span>\n </div>\n <input class='dropdown-input' id='").concat(this.elementId, "_input' name='").concat(this.options.field || this.options.label, "' value='").concat(headerValue, "'>\n <div class='arrow'>").concat(this.options.arrowIcon, "</div>\n ");
1631
1637
 
1632
1638
  if (this.options.allowClear === true) {
1633
- html += this.options.clearIcon;
1639
+ html += "<div class='clear'>".concat(this.options.clearIcon, "</div>");
1634
1640
  }
1635
1641
 
1636
1642
  html += " \n </div>\n <div id='".concat(this.elementId, "_mask' class='websy-dropdown-mask'></div>\n <div id='").concat(this.elementId, "_content' class='websy-dropdown-content'>\n ");
@@ -2372,8 +2378,17 @@ var WebsyForm = /*#__PURE__*/function () {
2372
2378
 
2373
2379
  var WebsyIcons = {
2374
2380
  'search-icon': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" xml:space=\"preserve\">\n<path d=\"M481.4,468.6c-17.2-17.2-34.4-34.4-51.6-51.6c-27.4-27.4-54.8-54.8-82.2-82.2c-4.8-4.8-9.5-9.5-14.3-14.3\n\tc29.4-32.5,47.4-75.5,47.4-122.7C380.7,97,298.7,15,197.9,15S15,97,15,197.9s82,182.9,182.9,182.9c47.2,0,90.3-18,122.7-47.4\n\tc15.7,15.7,31.4,31.4,47.1,47.1c27.4,27.4,54.8,54.8,82.2,82.2c6.3,6.3,12.5,12.5,18.8,18.8C476.8,489.6,489.6,476.8,481.4,468.6z\n\t M35,197.9C35,108.1,108.1,35,197.9,35s162.9,73.1,162.9,162.9s-73.1,162.9-162.9,162.9S35,287.7,35,197.9z\"/>\n</svg>\n\n ",
2375
- 'bag-icon': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n<path d=\"M456.6,472.3H43.4c-5.3,0-10.2-2.1-13.7-6c-3.6-3.9-5.2-9.2-4.5-14.4l37-285.4c1.2-9,9-15.9,18.2-15.9h339.2\n\tc9.2,0,17,6.8,18.2,15.8l37,285.4c0.7,5.2-1,10.5-4.5,14.4l0,0C466.8,470.1,461.9,472.3,456.6,472.3z M46.5,451.2h407l-36.3-279.6\n\tH82.8L46.5,451.2z\"/>\n<g>\n\t<path d=\"M361.3,157.1C357.3,94.8,308.4,46,249.9,46c-28,0-54.8,11.1-75.4,31.4c-20.7,20.3-33.5,47.9-35.9,77.8l-21.5-1.6\n\t\tc2.8-34.8,17.7-67.1,42.1-91C183.9,38.3,216.1,25,249.9,25c34.2,0,66.6,13.6,91.5,38.3c24.5,24.3,39.2,57.2,41.5,92.5L361.3,157.1z\n\t\t\"/>\n</g>\n</svg>\n\n ",
2376
- 'user-icon': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n<g>\n\t<path d=\"M248,260.5c-62,0-112.5-52.8-112.5-117.7S186,25,248,25s112.5,52.8,112.5,117.7S310,260.5,248,260.5z M248,45.9\n\t\tc-51,0-92.5,43.4-92.5,96.8s41.5,96.8,92.5,96.8c51,0,92.5-43.4,92.5-96.8S299,45.9,248,45.9z\"/>\n</g>\n<path d=\"M45,475C45,475,45,475,45,475c0-118.3,92-214.5,205-214.5c113,0,205,96.2,205,214.5c0,0,0,0,0,0h20c0,0,0,0,0,0\n\tc0-62.9-23.4-122-65.9-166.5c-42.5-44.5-99-69-159.1-69s-116.6,24.5-159.1,69C48.4,353,25,412.1,25,475c0,0,0,0,0,0H45z\"/>\n</svg>\n\n "
2381
+ 'bag-icon': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\">\n<path d=\"M456.6,472.3H43.4c-5.3,0-10.2-2.1-13.7-6c-3.6-3.9-5.2-9.2-4.5-14.4l37-285.4c1.2-9,9-15.9,18.2-15.9h339.2\n\tc9.2,0,17,6.8,18.2,15.8l37,285.4c0.7,5.2-1,10.5-4.5,14.4l0,0C466.8,470.1,461.9,472.3,456.6,472.3z M46.5,451.2h407l-36.3-279.6\n\tH82.8L46.5,451.2z\"/>\n<g>\n\t<path d=\"M361.3,157.1C357.3,94.8,308.4,46,249.9,46c-28,0-54.8,11.1-75.4,31.4c-20.7,20.3-33.5,47.9-35.9,77.8l-21.5-1.6\n\t\tc2.8-34.8,17.7-67.1,42.1-91C183.9,38.3,216.1,25,249.9,25c34.2,0,66.6,13.6,91.5,38.3c24.5,24.3,39.2,57.2,41.5,92.5L361.3,157.1z\n\t\t\"/>\n</g>\n</svg>\n\n ",
2382
+ 'user-icon': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n<g>\n\t<path d=\"M248,260.5c-62,0-112.5-52.8-112.5-117.7S186,25,248,25s112.5,52.8,112.5,117.7S310,260.5,248,260.5z M248,45.9\n\t\tc-51,0-92.5,43.4-92.5,96.8s41.5,96.8,92.5,96.8c51,0,92.5-43.4,92.5-96.8S299,45.9,248,45.9z\"/>\n</g>\n<path d=\"M45,475C45,475,45,475,45,475c0-118.3,92-214.5,205-214.5c113,0,205,96.2,205,214.5c0,0,0,0,0,0h20c0,0,0,0,0,0\n\tc0-62.9-23.4-122-65.9-166.5c-42.5-44.5-99-69-159.1-69s-116.6,24.5-159.1,69C48.4,353,25,412.1,25,475c0,0,0,0,0,0H45z\"/>\n</svg>\n\n ",
2383
+ 'Search': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" xml:space=\"preserve\">\n<path d=\"M481.4,468.6c-17.2-17.2-34.4-34.4-51.6-51.6c-27.4-27.4-54.8-54.8-82.2-82.2c-4.8-4.8-9.5-9.5-14.3-14.3\n\tc29.4-32.5,47.4-75.5,47.4-122.7C380.7,97,298.7,15,197.9,15S15,97,15,197.9s82,182.9,182.9,182.9c47.2,0,90.3-18,122.7-47.4\n\tc15.7,15.7,31.4,31.4,47.1,47.1c27.4,27.4,54.8,54.8,82.2,82.2c6.3,6.3,12.5,12.5,18.8,18.8C476.8,489.6,489.6,476.8,481.4,468.6z\n\t M35,197.9C35,108.1,108.1,35,197.9,35s162.9,73.1,162.9,162.9s-73.1,162.9-162.9,162.9S35,287.7,35,197.9z\"/>\n</svg>\n\n ",
2384
+ 'Bag': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\">\n<path d=\"M456.6,472.3H43.4c-5.3,0-10.2-2.1-13.7-6c-3.6-3.9-5.2-9.2-4.5-14.4l37-285.4c1.2-9,9-15.9,18.2-15.9h339.2\n\tc9.2,0,17,6.8,18.2,15.8l37,285.4c0.7,5.2-1,10.5-4.5,14.4l0,0C466.8,470.1,461.9,472.3,456.6,472.3z M46.5,451.2h407l-36.3-279.6\n\tH82.8L46.5,451.2z\"/>\n<g>\n\t<path d=\"M361.3,157.1C357.3,94.8,308.4,46,249.9,46c-28,0-54.8,11.1-75.4,31.4c-20.7,20.3-33.5,47.9-35.9,77.8l-21.5-1.6\n\t\tc2.8-34.8,17.7-67.1,42.1-91C183.9,38.3,216.1,25,249.9,25c34.2,0,66.6,13.6,91.5,38.3c24.5,24.3,39.2,57.2,41.5,92.5L361.3,157.1z\n\t\t\"/>\n</g>\n</svg>\n\n ",
2385
+ 'User': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n<g>\n\t<path d=\"M248,260.5c-62,0-112.5-52.8-112.5-117.7S186,25,248,25s112.5,52.8,112.5,117.7S310,260.5,248,260.5z M248,45.9\n\t\tc-51,0-92.5,43.4-92.5,96.8s41.5,96.8,92.5,96.8c51,0,92.5-43.4,92.5-96.8S299,45.9,248,45.9z\"/>\n</g>\n<path d=\"M45,475C45,475,45,475,45,475c0-118.3,92-214.5,205-214.5c113,0,205,96.2,205,214.5c0,0,0,0,0,0h20c0,0,0,0,0,0\n\tc0-62.9-23.4-122-65.9-166.5c-42.5-44.5-99-69-159.1-69s-116.6,24.5-159.1,69C48.4,353,25,412.1,25,475c0,0,0,0,0,0H45z\"/>\n</svg>\n\n ",
2386
+ 'DockLeft': "\n <svg xmlns=\"http://www.w3.org/2000/svg\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n\t<g>\n\t\t<path d=\"M419.7,425H80.3C49.8,425,25,400.2,25,369.7V130.3C25,99.8,49.8,75,80.3,75h339.4c30.5,0,55.3,24.8,55.3,55.3v239.4\n\t\t\tC475,400.2,450.2,425,419.7,425z M80.3,95C60.8,95,45,110.8,45,130.3v239.4c0,19.5,15.8,35.3,35.3,35.3h339.4\n\t\t\tc19.5,0,35.3-15.8,35.3-35.3V130.3c0-19.5-15.8-35.3-35.3-35.3H80.3z\"/>\n\t</g>\n\t<path d=\"M92.8,90.1H92h-4.2c-24.8,0-45,20.2-45,45v229.8c0,24.8,20.2,45,45,45H92h0.8h105.4V90.1H92.8z\"/>\n</svg>\n\n ",
2387
+ 'DockRight': "\n <svg xmlns=\"http://www.w3.org/2000/svg\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n\t<g>\n\t\t<path d=\"M25,369.7V130.3C25,99.8,49.8,75,80.3,75h339.4c30.5,0,55.3,24.8,55.3,55.3v239.4c0,30.5-24.8,55.3-55.3,55.3H80.3\n\t\t\tC49.8,425,25,400.2,25,369.7z M80.3,95C60.8,95,45,110.8,45,130.3v239.4c0,19.5,15.8,35.3,35.3,35.3h339.4\n\t\t\tc19.5,0,35.3-15.8,35.3-35.3V130.3c0-19.5-15.8-35.3-35.3-35.3H80.3z\"/>\n\t</g>\n\t<path d=\"M407.2,90.1h0.8h4.2c24.8,0,45,20.2,45,45v229.8c0,24.8-20.2,45-45,45H408h-0.8H301.8V90.1H407.2z\"/>\n</svg>\n\n ",
2388
+ 'Pin': "\n <svg xmlns=\"http://www.w3.org/2000/svg\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n\t<g>\n\t\t<path d=\"M368,312.1H132l-0.6-9.4c-0.1-2.4-0.2-4.8-0.2-7.1c0-40.3,20.7-78.1,54.4-99.9V73.2h-9c-13,0-23.6-10.6-23.6-23.6\n\t\t\tS163.5,26,176.6,26h146.9c13,0,23.6,10.6,23.6,23.6s-10.6,23.6-23.6,23.6h-9v122.5c33.7,21.8,54.4,59.5,54.4,99.9\n\t\t\tc0,2.3-0.1,4.7-0.2,7.1L368,312.1z M151.2,292.1h197.5c-1.2-33.8-19.9-65.1-49.4-82.1l-5-2.9V53.2h29c2,0,3.6-1.6,3.6-3.6\n\t\t\tc0-2-1.6-3.6-3.6-3.6H176.6c-2,0-3.6,1.6-3.6,3.6c0,2,1.6,3.6,3.6,3.6h29v153.9l-5,2.9C171.1,227,152.4,258.3,151.2,292.1z\"/>\n\t</g>\n\t<path d=\"M260.9,403.8V299.9h-21.8v108.8h0c0.1,36.1,4.9,65.3,10.9,65.3c6,0,10.9-29.7,10.9-66.4\n\t\tC260.9,406.4,260.9,405.1,260.9,403.8z\"/>\n</svg>\n\n ",
2389
+ 'WindowPopout': "\n <svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n\t viewBox=\"0 0 500 500\" style=\"enable-background:new 0 0 500 500;\" xml:space=\"preserve\">\n<style type=\"text/css\">\n\t.st0{fill:none;stroke:#000000;stroke-width:20;stroke-miterlimit:10;}\n</style>\n<path class=\"st0\" d=\"M420.1,359.6h-285c-24.7,0-45-20.2-45-45V124.9c0-24.7,20.2-45,45-45h285c24.7,0,45,20.2,45,45v189.7\n\tC465.1,339.3,444.9,359.6,420.1,359.6z\"/>\n<path class=\"st0\" d=\"M407.3,389.8c-6.3,17.3-22.9,29.7-42.3,29.7H80c-24.7,0-45-20.2-45-45V184.9c0-18.2,10.9-33.9,26.5-41\"/>\n</svg>\n\n ",
2390
+ 'Plus': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 500 500\">\n<path d=\"M254.7,486h-10.3c-5.5,0-10-4.5-10-10V26c0-5.5,4.5-10,10-10h10.3c5.5,0,10,4.5,10,10v450C264.6,481.5,260.2,486,254.7,486z\"/>\n<path d=\"M15,255.1v-10.3c0-5.5,4.5-10,10-10h450c5.5,0,10,4.5,10,10v10.3c0,5.5-4.5,10-10,10H25C19.5,265.1,15,260.7,15,255.1z\"/>\n</svg>\n\n ",
2391
+ 'Minus': "\n <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 500 500\">\n<path d=\"M15,255.1v-10.3c0-5.5,4.5-10,10-10h450c5.5,0,10,4.5,10,10v10.3c0,5.5-4.5,10-10,10H25C19.5,265.1,15,260.7,15,255.1z\"/>\n</svg>\n "
2377
2392
  };
2378
2393
 
2379
2394
  var WebsyLoadingDialog = /*#__PURE__*/function () {
@@ -4161,9 +4176,7 @@ var WebsyRouter = /*#__PURE__*/function () {
4161
4176
  if (this.previousView !== this.currentView || group !== 'main') {
4162
4177
  this.showComponents(view);
4163
4178
  this.publish('show', [view, params, group]);
4164
- }
4165
-
4166
- if (this.previousView === this.currentView && this.previousParams.path !== this.currentParams.path) {
4179
+ } else if (this.previousView === this.currentView && this.previousParams.path !== this.currentParams.path) {
4167
4180
  this.showComponents(view);
4168
4181
  this.publish('show', [view, params, group]);
4169
4182
  }
@@ -4292,12 +4305,6 @@ var WebsyRouter = /*#__PURE__*/function () {
4292
4305
  return;
4293
4306
  }
4294
4307
 
4295
- if (toggle === false) {
4296
- this.showView(this.currentView, this.currentParams, group);
4297
- } else if (newPath && newPath !== '') {
4298
- this.showView(newPath, null, group);
4299
- }
4300
-
4301
4308
  if (this.usesHTMLSuffix === true) {
4302
4309
  inputPath = window.location.pathname.split('/').pop() + inputPath;
4303
4310
  }
@@ -4325,6 +4332,12 @@ var WebsyRouter = /*#__PURE__*/function () {
4325
4332
  } else {//
4326
4333
  }
4327
4334
  }
4335
+
4336
+ if (toggle === false) {
4337
+ this.showView(this.currentView, this.currentParams, group);
4338
+ } else if (newPath && newPath !== '') {
4339
+ this.showView(newPath, null, group);
4340
+ }
4328
4341
  }
4329
4342
  }, {
4330
4343
  key: "on",
@@ -5991,7 +6004,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
5991
6004
  bodyHtml += '</colgroup>';
5992
6005
  }
5993
6006
 
5994
- data.forEach(function (row) {
6007
+ data.forEach(function (row, rowIndex) {
5995
6008
  bodyHtml += "<tr class=\"websy-table-row\">";
5996
6009
  row.forEach(function (cell, cellIndex) {
5997
6010
  if (typeof sizingColumns[cellIndex] === 'undefined') {
@@ -6021,14 +6034,24 @@ var WebsyTable3 = /*#__PURE__*/function () {
6021
6034
  }
6022
6035
 
6023
6036
  console.log('rowspan', cell.rowspan);
6024
- bodyHtml += "<td \n class='websy-table-cell ".concat((cell.classes || []).join(' '), "'\n style='").concat(style, "'\n data-info='").concat(cell.value, "'\n colspan='").concat(cell.colspan || 1, "'\n rowspan='").concat(cell.rowspan || 1, "'\n "); // if (useWidths === true) {
6037
+ bodyHtml += "<td \n class='websy-table-cell ".concat((cell.classes || []).join(' '), "'\n style='").concat(style, "'\n data-info='").concat(cell.value, "'\n colspan='").concat(cell.colspan || 1, "'\n rowspan='").concat(cell.rowspan || 1, "'\n data-row-index='").concat(rowIndex, "'\n data-col-index='").concat(cellIndex, "'\n "); // if (useWidths === true) {
6025
6038
  // bodyHtml += `
6026
6039
  // style='width: ${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}px!important'
6027
6040
  // width='${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}'
6028
6041
  // `
6029
6042
  // }
6030
6043
 
6031
- bodyHtml += "\n >\n ".concat(cell.value, "\n </td>");
6044
+ bodyHtml += "\n >";
6045
+
6046
+ if (cell.expandable === true) {
6047
+ bodyHtml += "<i \n data-row-index='".concat(rowIndex, "'\n data-col-index='").concat(cellIndex, "'\n class='websy-table-cell-expand'\n >").concat(WebsyDesigns.Icons.Plus, "</i>");
6048
+ }
6049
+
6050
+ if (cell.collapsable === true) {
6051
+ bodyHtml += "<i \n data-row-index='".concat(rowIndex, "'\n data-col-index='").concat(cellIndex, "'\n class='websy-table-cell-collapse'\n >").concat(WebsyDesigns.Icons.Minus, "</i>");
6052
+ }
6053
+
6054
+ bodyHtml += "\n ".concat(cell.value, "\n </td>");
6032
6055
  });
6033
6056
  bodyHtml += "</tr>";
6034
6057
  }); // bodyHtml += `</div>`
@@ -6274,14 +6297,30 @@ var WebsyTable3 = /*#__PURE__*/function () {
6274
6297
  }, {
6275
6298
  key: "handleClick",
6276
6299
  value: function handleClick(event) {
6300
+ var colIndex = +event.target.getAttribute('data-col-index');
6301
+ var rowIndex = +event.target.getAttribute('data-row-index');
6302
+
6277
6303
  if (event.target.classList.contains('websy-table-search-icon')) {
6278
6304
  console.log('clicked on search icon');
6279
- var colIndex = +event.target.getAttribute('data-col-index');
6280
6305
 
6281
6306
  if (this.options.columns[this.options.columns.length - 1][colIndex].onSearch) {
6282
6307
  this.options.columns[this.options.columns.length - 1][colIndex].onSearch(event, this.options.columns[this.options.columns.length - 1][colIndex]);
6283
6308
  }
6284
6309
  }
6310
+
6311
+ if (event.target.classList.contains('websy-table-cell-collapse')) {
6312
+ if (this.options.onCollapseCell) {
6313
+ this.options.onCollapseCell(event, +rowIndex, +colIndex);
6314
+ } else {// out of box function
6315
+ }
6316
+ }
6317
+
6318
+ if (event.target.classList.contains('websy-table-cell-expand')) {
6319
+ if (this.options.onExpandCell) {
6320
+ this.options.onExpandCell(event, +rowIndex, +colIndex);
6321
+ } else {// out of box function
6322
+ }
6323
+ }
6285
6324
  }
6286
6325
  }, {
6287
6326
  key: "handleMouseDown",
@@ -7154,6 +7193,8 @@ var WebsyChart = /*#__PURE__*/function () {
7154
7193
 
7155
7194
  if (this.options.data.bottom.formatter) {
7156
7195
  this.longestBottom = this.options.data.bottom.formatter(this.options.data.bottom.max).toString();
7196
+ } else {
7197
+ this.longestBottom = '01/01/2000';
7157
7198
  }
7158
7199
  }
7159
7200
 
@@ -7598,7 +7639,11 @@ var WebsyChart = /*#__PURE__*/function () {
7598
7639
  // We currently only support 'Auto'
7599
7640
  var labels = this.labelLayer.selectAll(".label_".concat(series.key)).data(series.data);
7600
7641
  labels.exit().transition(this.transition).style('stroke-opacity', 1e-6).remove();
7601
- labels.attr('x', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('class', "label_".concat(series.key)).attr('fill', function (d) {
7642
+ labels.attr('x', function (d) {
7643
+ return getLabelX.call(_this42, d, series.labelPosition);
7644
+ }).attr('y', function (d) {
7645
+ return getLabelY.call(_this42, d, series.labelPosition);
7646
+ }).attr('class', "label_".concat(series.key)).attr('fill', function (d) {
7602
7647
  return _this42.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
7603
7648
  }).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).transition(this.transition).text(function (d) {
7604
7649
  return d.y.label || d.y.value;
@@ -7623,7 +7668,11 @@ var WebsyChart = /*#__PURE__*/function () {
7623
7668
  }
7624
7669
  }
7625
7670
  });
7626
- labels.enter().append('text').attr('class', "label_".concat(series.key)).attr('x', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('alignment-baseline', 'central').attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle').attr('fill', function (d) {
7671
+ labels.enter().append('text').attr('class', "label_".concat(series.key)).attr('x', function (d) {
7672
+ return getLabelX.call(_this42, d, series.labelPosition);
7673
+ }).attr('y', function (d) {
7674
+ return getLabelY.call(_this42, d, series.labelPosition);
7675
+ }).attr('alignment-baseline', 'central').attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle').attr('fill', function (d) {
7627
7676
  return _this42.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
7628
7677
  }).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).text(function (d) {
7629
7678
  return d.y.label || d.y.value;