@deephaven/grid 0.15.1-beta.2 → 0.15.1-beta.4
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.
- package/dist/GridRenderer.d.ts.map +1 -1
- package/dist/GridRenderer.js +107 -1
- package/dist/GridRenderer.js.map +1 -1
- package/dist/GridTheme.d.ts +3 -0
- package/dist/GridTheme.d.ts.map +1 -1
- package/dist/GridTheme.js +3 -0
- package/dist/GridTheme.js.map +1 -1
- package/dist/GridUtils.d.ts +2 -0
- package/dist/GridUtils.d.ts.map +1 -1
- package/dist/GridUtils.js +28 -0
- package/dist/GridUtils.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GridRenderer.d.ts","sourceRoot":"","sources":["../src/GridRenderer.ts"],"names":[],"mappings":";AAIA,OAAO,EACL,SAAS,EACT,YAAY,EACZ,SAAS,EACT,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,WAAW,EAAE,EAClB,cAAc,EACd,UAAU,EACV,YAAY,EACb,MAAM,eAAe,CAAC;AAIvB,oBAAY,6BAA6B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"GridRenderer.d.ts","sourceRoot":"","sources":["../src/GridRenderer.ts"],"names":[],"mappings":"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"}
|
package/dist/GridRenderer.js
CHANGED
|
@@ -2000,7 +2000,12 @@ export class GridRenderer {
|
|
|
2000
2000
|
scrollBarActiveColor,
|
|
2001
2001
|
scrollBarSize,
|
|
2002
2002
|
scrollBarHoverSize,
|
|
2003
|
-
scrollBarCasingWidth
|
|
2003
|
+
scrollBarCasingWidth,
|
|
2004
|
+
scrollBarSelectionTick,
|
|
2005
|
+
scrollBarSelectionTickColor,
|
|
2006
|
+
scrollBarActiveSelectionTickColor,
|
|
2007
|
+
autoSelectRow,
|
|
2008
|
+
autoSelectColumn
|
|
2004
2009
|
} = theme;
|
|
2005
2010
|
var isInbounds = mouseX != null && mouseY != null && mouseX <= width && mouseY <= height;
|
|
2006
2011
|
var isVerticalBarHover = isDraggingVerticalScrollBar || hasVerticalBar && !isDraggingHorizontalScrollBar && !isDragging && mouseX != null && mouseY != null && mouseX >= width - scrollBarHoverSize && mouseY <= barHeight + columnHeaderHeight && isInbounds;
|
|
@@ -2037,6 +2042,55 @@ export class GridRenderer {
|
|
|
2037
2042
|
}
|
|
2038
2043
|
|
|
2039
2044
|
context.fillRect(x, y + scrollBarCasingWidth, handleWidth, hScrollBarSize - scrollBarCasingWidth);
|
|
2045
|
+
|
|
2046
|
+
if (!autoSelectRow && scrollBarSelectionTick && scrollBarSelectionTickColor != null && scrollBarActiveSelectionTickColor != null) {
|
|
2047
|
+
context.fillStyle = scrollBarSelectionTickColor; // Scrollbar Selection Tick
|
|
2048
|
+
|
|
2049
|
+
var {
|
|
2050
|
+
selectedRanges,
|
|
2051
|
+
cursorColumn
|
|
2052
|
+
} = state;
|
|
2053
|
+
var {
|
|
2054
|
+
lastLeft,
|
|
2055
|
+
columnCount
|
|
2056
|
+
} = metrics;
|
|
2057
|
+
var filteredRanges = [...selectedRanges].filter(value => value.startColumn != null && value.endColumn != null);
|
|
2058
|
+
var sortedRanges = filteredRanges.map(value => [value.startColumn, value.endColumn]).sort(GridUtils.compareRanges);
|
|
2059
|
+
var mergedRanges = GridUtils.mergeSortedRanges(sortedRanges);
|
|
2060
|
+
|
|
2061
|
+
var getTickX = index => {
|
|
2062
|
+
if (index <= lastLeft) {
|
|
2063
|
+
return index / lastLeft * (barWidth - handleWidth);
|
|
2064
|
+
}
|
|
2065
|
+
|
|
2066
|
+
return barWidth - handleWidth + (index - lastLeft) / (columnCount - lastLeft) * handleWidth;
|
|
2067
|
+
};
|
|
2068
|
+
|
|
2069
|
+
for (var i = 0; i < mergedRanges.length; i += 1) {
|
|
2070
|
+
var range = mergedRanges[i];
|
|
2071
|
+
var startColumn = range[0];
|
|
2072
|
+
var endColumn = range[1];
|
|
2073
|
+
|
|
2074
|
+
if (startColumn != null && endColumn != null && (startColumn !== cursorColumn || endColumn !== cursorColumn)) {
|
|
2075
|
+
var tickX = getTickX(startColumn);
|
|
2076
|
+
var tickWidth = Math.max(1, Math.round(getTickX(endColumn + 1) - tickX));
|
|
2077
|
+
var trackHeight = hScrollBarSize - scrollBarCasingWidth;
|
|
2078
|
+
context.fillRect(tickX, y + scrollBarCasingWidth + Math.round(trackHeight / 3), tickWidth, Math.round(trackHeight / 3));
|
|
2079
|
+
}
|
|
2080
|
+
} // Current Active Tick
|
|
2081
|
+
|
|
2082
|
+
|
|
2083
|
+
if (cursorColumn != null) {
|
|
2084
|
+
var _tickX = getTickX(cursorColumn);
|
|
2085
|
+
|
|
2086
|
+
var _tickWidth = 2;
|
|
2087
|
+
|
|
2088
|
+
var _trackHeight = hScrollBarSize - scrollBarCasingWidth;
|
|
2089
|
+
|
|
2090
|
+
context.fillStyle = scrollBarActiveSelectionTickColor;
|
|
2091
|
+
context.fillRect(_tickX, y + scrollBarCasingWidth, _tickWidth, _trackHeight);
|
|
2092
|
+
}
|
|
2093
|
+
}
|
|
2040
2094
|
}
|
|
2041
2095
|
|
|
2042
2096
|
if (hasVerticalBar) {
|
|
@@ -2059,6 +2113,58 @@ export class GridRenderer {
|
|
|
2059
2113
|
}
|
|
2060
2114
|
|
|
2061
2115
|
context.fillRect(_x10 + scrollBarCasingWidth, _y10, vScrollBarSize - scrollBarCasingWidth, handleHeight);
|
|
2116
|
+
|
|
2117
|
+
if (!autoSelectColumn && scrollBarSelectionTick && scrollBarSelectionTickColor != null && scrollBarActiveSelectionTickColor != null) {
|
|
2118
|
+
// Scrollbar Selection Tick
|
|
2119
|
+
var {
|
|
2120
|
+
selectedRanges: _selectedRanges,
|
|
2121
|
+
cursorRow
|
|
2122
|
+
} = state;
|
|
2123
|
+
var {
|
|
2124
|
+
lastTop,
|
|
2125
|
+
rowCount
|
|
2126
|
+
} = metrics;
|
|
2127
|
+
|
|
2128
|
+
var getTickY = index => {
|
|
2129
|
+
if (index <= lastTop) {
|
|
2130
|
+
return index / lastTop * (barHeight - handleHeight);
|
|
2131
|
+
}
|
|
2132
|
+
|
|
2133
|
+
return barHeight - handleHeight + (index - lastTop) / (rowCount - lastTop) * handleHeight;
|
|
2134
|
+
};
|
|
2135
|
+
|
|
2136
|
+
context.fillStyle = scrollBarSelectionTickColor;
|
|
2137
|
+
|
|
2138
|
+
var _filteredRanges = [..._selectedRanges].filter(value => value.startRow != null && value.endRow != null);
|
|
2139
|
+
|
|
2140
|
+
var _sortedRanges = _filteredRanges.map(value => [value.startRow, value.endRow]).sort(GridUtils.compareRanges);
|
|
2141
|
+
|
|
2142
|
+
var _mergedRanges = GridUtils.mergeSortedRanges(_sortedRanges);
|
|
2143
|
+
|
|
2144
|
+
for (var _i13 = 0; _i13 < _mergedRanges.length; _i13 += 1) {
|
|
2145
|
+
var _range = _mergedRanges[_i13];
|
|
2146
|
+
var startRow = _range[0];
|
|
2147
|
+
var endRow = _range[1];
|
|
2148
|
+
|
|
2149
|
+
if (startRow != null && endRow != null && (startRow !== cursorRow || endRow !== cursorRow)) {
|
|
2150
|
+
var tickY = getTickY(startRow);
|
|
2151
|
+
var trackWidth = vScrollBarSize - scrollBarCasingWidth;
|
|
2152
|
+
var tickHeight = Math.max(1, Math.round(getTickY(endRow + 1) - tickY));
|
|
2153
|
+
context.fillRect(_x10 + scrollBarCasingWidth + Math.round(trackWidth / 3), tickY, Math.round(trackWidth / 3), tickHeight);
|
|
2154
|
+
}
|
|
2155
|
+
} // Current Active Tick
|
|
2156
|
+
|
|
2157
|
+
|
|
2158
|
+
if (cursorRow != null) {
|
|
2159
|
+
var _tickY = Math.round(getTickY(cursorRow));
|
|
2160
|
+
|
|
2161
|
+
var _trackWidth = vScrollBarSize - scrollBarCasingWidth;
|
|
2162
|
+
|
|
2163
|
+
var _tickHeight = 2;
|
|
2164
|
+
context.fillStyle = scrollBarActiveSelectionTickColor;
|
|
2165
|
+
context.fillRect(_x10 + scrollBarCasingWidth, _tickY, _trackWidth, _tickHeight);
|
|
2166
|
+
}
|
|
2167
|
+
}
|
|
2062
2168
|
}
|
|
2063
2169
|
|
|
2064
2170
|
context.translate(-rowHeaderWidth, -columnHeaderHeight);
|