@genome-spy/core 0.49.0 → 0.50.0

package/dist/src/gl/includes/common.glsl.js

@@ -1,2 +1,2 @@
-const shader = "#define PI 3.141593\nuniform View{mediump vec2 uViewOffset;mediump vec2 uViewScale;mediump vec2 uViewportSize;lowp float uDevicePixelRatio;lowp float uViewOpacity;bool uPickingEnabled;};/***Maps a coordinate on the unit scale to a normalized device coordinate.*(0,0)is at the bottom left corner.*/vec4 unitToNdc(vec2 coord){return vec4((coord*uViewScale+uViewOffset)*2.0-1.0,0.0,1.0);}vec4 unitToNdc(float x,float y){return unitToNdc(vec2(x,y));}vec4 pixelsToNdc(vec2 coord){return unitToNdc(coord/uViewportSize);}vec4 pixelsToNdc(float x,float y){return pixelsToNdc(vec2(x,y));}float linearstep(float edge0,float edge1,float x){return clamp((x-edge0)/(edge1-edge0),0.0,1.0);}/***Specialized linearstep for doing antialiasing*/float distanceToRatio(float d){return clamp(d*uDevicePixelRatio+0.5,0.0,1.0);}vec4 distanceToColor(float d,vec4 fill,vec4 stroke,float halfStrokeWidth){if(halfStrokeWidth>0.0){float sd=abs(d)-halfStrokeWidth;return mix(stroke,d<=0.0 ? fill : vec4(0.0),distanceToRatio(sd));}else{return fill*distanceToRatio(-d);}}";
+const shader = "#define PI 3.141593\nuniform View{mediump vec2 uViewOffset;mediump vec2 uViewScale;mediump vec2 uViewportSize;lowp float uDevicePixelRatio;lowp float uViewOpacity;bool uPickingEnabled;};/***Maps a coordinate on the unit scale to a normalized device coordinate.*(0,0)is at the bottom left corner.*/vec4 unitToNdc(vec2 coord){return vec4((coord*uViewScale+uViewOffset)*2.0-1.0,0.0,1.0);}vec4 unitToNdc(float x,float y){return unitToNdc(vec2(x,y));}vec4 pixelsToNdc(vec2 coord){return unitToNdc(coord/uViewportSize);}vec4 pixelsToNdc(float x,float y){return pixelsToNdc(vec2(x,y));}float linearstep(float edge0,float edge1,float x){return clamp((x-edge0)/(edge1-edge0),0.0,1.0);}/***Calculates a gamma for antialiasing opacity based on the color.*/float getGammaForColor(vec3 rgb){return mix(1.25,0.75,smoothstep(0.0,1.0,dot(rgb,vec3(0.299,0.587,0.114))));}/***Specialized linearstep for doing antialiasing*/float distanceToRatio(float d){return clamp(d*uDevicePixelRatio+0.5,0.0,1.0);}vec4 distanceToColor(float d,vec4 fill,vec4 stroke,float halfStrokeWidth){if(halfStrokeWidth>0.0){float sd=abs(d)-halfStrokeWidth;return mix(stroke,d<=0.0 ? fill : vec4(0.0),distanceToRatio(sd));}else{return fill*distanceToRatio(-d);}}";
 export default shader;

package/dist/src/marks/link.d.ts

@@ -1,4 +1,11 @@
-export default class LinkMark extends Mark {
+/**
+ * @extends {Mark<import("../spec/mark.js").LinkProps>}
+ */
+export default class LinkMark extends Mark<import("../spec/mark.js").LinkProps> {
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     /**
      * Only available if "WebGL Draft Extensions" is enabled in chrome://flags
      * But seems to work.

package/dist/src/marks/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/marks/link.js"],"names":[],"mappings":"AAYA;IAgCQ;;;;;OAKG;IACH,yBAEC;IAoHD;;;;;;MAKC;CAwFR;iBA/PgB,WAAW"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/marks/link.js"],"names":[],"mappings":"AAYA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAoC/C;IATG;;;;;OAKG;IACH,yBAEC;IAsHD;;;;;;MAKC;CA4FR;iBArQgB,WAAW"}

package/dist/src/marks/link.fragment.glsl.js

@@ -1,2 +1,2 @@
-const shader = "in vec4 vColor;in float vSize;in float vNormalLengthInPixels;out lowp vec4 fragColor;void main(void){float dpr=uDevicePixelRatio;float distance=abs(vNormalLengthInPixels);float opacity=clamp(((vSize/2.0-distance)*dpr),0.0,1.0);fragColor=vColor*opacity;if(uPickingEnabled){fragColor=vPickingColor;}}";
+const shader = "in vec4 vColor;in float vSize;in float vNormalLengthInPixels;in float vGamma;out lowp vec4 fragColor;void main(void){float dpr=uDevicePixelRatio;float distance=abs(vNormalLengthInPixels);float opacity=clamp(((vSize/2.0-distance)*dpr),0.0,1.0);opacity=pow(opacity,vGamma);fragColor=vColor*opacity;if(uPickingEnabled){fragColor=vPickingColor;}}";
 export default shader;

package/dist/src/marks/link.js

@@ -10,6 +10,9 @@ import { isChannelDefWithScale } from "../encoder/encoder.js";
 const LINK_SHAPES = ["arc", "dome", "diagonal", "line"];
 const ORIENTS = ["vertical", "horizontal"];
 
+/**
+ * @extends {Mark<import("../spec/mark.js").LinkProps>}
+ */
 export default class LinkMark extends Mark {
     /**
      * @param {import("../view/unitView.js").default} unitView
@@ -17,30 +20,27 @@ export default class LinkMark extends Mark {
     constructor(unitView) {
         super(unitView);
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                x: 0.0,
-                x2: undefined,
-                y: 0.0,
-                y2: undefined,
-                size: 1.0,
-                color: "black",
-                opacity: 1.0,
-
-                segments: 101, // Performance is affected more by the fill rate, i.e. number of pixels
-                arcHeightFactor: 1.0,
-                minArcHeight: 1.5,
-                minPickingSize: 3.0,
-                clampApex: false,
-                maxChordLength: 50000,
-                arcFadingDistance: false,
-                noFadingOnPointSelection: true,
-
-                linkShape: "arc",
-                orient: "vertical",
-            })
-        );
+        this.augmentDefaultProperties({
+            x: 0.0,
+            x2: undefined,
+            y: 0.0,
+            y2: undefined,
+            size: 1.0,
+            color: "black",
+            opacity: 1.0,
+
+            segments: 101, // Performance is affected more by the fill rate, i.e. number of pixels
+            arcHeightFactor: 1.0,
+            minArcHeight: 1.5,
+            minPickingSize: 3.0,
+            clampApex: false,
+            maxChordLength: 50000,
+            arcFadingDistance: false,
+            noFadingOnPointSelection: true,
+
+            linkShape: "arc",
+            orient: "vertical",
+        });
 
         /**
          * Only available if "WebGL Draft Extensions" is enabled in chrome://flags
@@ -53,6 +53,9 @@ export default class LinkMark extends Mark {
         );
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
             "uniqueId",
@@ -62,7 +65,6 @@ export default class LinkMark extends Mark {
             "y",
             "y2",
             "size",
-            "height",
             "color",
             "opacity",
         ];
@@ -137,7 +139,7 @@ export default class LinkMark extends Mark {
         this.registerMarkUniformValue(
             "uSegmentBreaks",
             props.segments,
-            (x) => x + 1
+            (x) => x
         );
         this.registerMarkUniformValue(
             "uNoFadingOnPointSelection",
@@ -205,6 +207,14 @@ export default class LinkMark extends Mark {
     render(options) {
         const gl = this.gl;
 
+        const getInstanceVertexCount = () => {
+            const breaks = /** @type {Float32Array} */ (
+                this.markUniformInfo.uniforms.uSegmentBreaks
+            )[0];
+
+            return (breaks + 1) * 2;
+        };
+
         return this._baseInstanceExt
             ? this.createRenderCallback((offset, count) => {
                   // Using the following extension, which, however, is only a draft and
@@ -214,9 +224,7 @@ export default class LinkMark extends Mark {
                   this._baseInstanceExt.drawArraysInstancedBaseInstanceWEBGL(
                       gl.TRIANGLE_STRIP,
                       0,
-                      /** @type {Float32Array} */ (
-                          this.markUniformInfo.uniforms.uSegmentBreaks
-                      )[0] * 2,
+                      getInstanceVertexCount(),
                       count,
                       offset
                   );
@@ -252,9 +260,7 @@ export default class LinkMark extends Mark {
                   gl.drawArraysInstanced(
                       gl.TRIANGLE_STRIP,
                       0,
-                      /** @type {Float32Array} */ (
-                          this.markUniformInfo.uniforms.uSegmentBreaks
-                      )[0] * 2,
+                      getInstanceVertexCount(),
                       count
                   );
               }, options);

package/dist/src/marks/link.vertex.glsl.js

@@ -1,2 +1,2 @@
-const shader = "out vec4 vColor;out float vSize;out float vNormalLengthInPixels;const int SHAPE_ARC=0;const int SHAPE_DOME=1;const int SHAPE_DIAGONAL=2;const int SHAPE_LINE=3;const int ORIENT_VERTICAL=0;const int ORIENT_HORIZONTAL=1;float distanceFromLine(vec2 pointOnLine1,vec2 pointOnLine2,vec2 point){vec2 a=point-pointOnLine1;vec2 b=pointOnLine2-pointOnLine1;vec2 proj=dot(a,b)/dot(b,b)*b;return length(a-proj);}bool isInsideViewport(vec2 point,float marginFactor){vec2 margin=uViewportSize*vec2(marginFactor);return point.x>=-margin.x&&point.x<=uViewportSize.x+margin.x&&point.y>=-margin.y&&point.y<=uViewportSize.y+margin.y;}void main(void){float pixelSize=1.0/uDevicePixelRatio;float opacity=getScaled_opacity()*uViewOpacity;vec2 p1,p2,p3,p4;vec2 a=applySampleFacet(vec2(getScaled_x(),getScaled_y()))*uViewportSize;vec2 b=applySampleFacet(vec2(getScaled_x2(),getScaled_y2()))*uViewportSize;if(uShape<=SHAPE_DOME){if(uShape==SHAPE_DOME){vec2 height=vec2(0.0);if(uOrient==ORIENT_VERTICAL){p1=vec2(min(a.x,b.x),b.y);p4=vec2(max(a.x,b.x),b.y);height=vec2(0.0,a.y-b.y);if(uClampApex){if(p4.x>0.0){p1.x=max(p1.x,-p4.x);}if(p1.x<uViewportSize.x){p4.x=min(p4.x,2.0*uViewportSize.x-p1.x);}}}else{p1=vec2(b.x,min(a.y,b.y));p4=vec2(b.x,max(a.y,b.y));height=vec2(a.x-b.x,0.0);if(uClampApex){if(p4.y>0.0){p1.y=max(p1.y,-p4.y);}if(p1.y<uViewportSize.y){p4.y=min(p4.y,2.0*uViewportSize.y-p1.y);}}}vec2 controlOffset=height/0.75;p2=p1+controlOffset;p3=p4+controlOffset;}if(uShape==SHAPE_ARC){p1=a;p4=b;vec2 chordVector=p4-p1;vec2 unitChordVector=normalize(chordVector);vec2 chordNormal=vec2(-unitChordVector.y,unitChordVector.x);float chordLength=length(chordVector);if(chordLength>uMaxChordLength){if(isInsideViewport(p1,2.0)){chordLength=uMaxChordLength;p4=p1+unitChordVector*uMaxChordLength;}else if(isInsideViewport(p4,2.0)){chordLength=uMaxChordLength;p1=p4-unitChordVector*uMaxChordLength;}}float height=max(chordLength/2.0*uArcHeightFactor,uMinArcHeight);vec2 controlOffset=chordNormal*height/0.75;p2=p1+controlOffset;p3=p4+controlOffset;}}else if(uShape==SHAPE_DIAGONAL){if(uOrient==ORIENT_VERTICAL){p1=a;p2=vec2(a.x,(a.y+b.y)/2.0);p3=vec2(b.x,(a.y+b.y)/2.0);p4=b;}else{p1=a;p2=vec2((a.x+b.x)/2.0,a.y);p3=vec2((a.x+b.x)/2.0,b.y);p4=b;}}else if(uShape==SHAPE_LINE){p1=a;p2=(a+b)/2.0;p3=p2;p4=b;}vec2 strip=vec2(float(gl_VertexID/2)/float(uSegmentBreaks),float(gl_VertexID % 2)-0.5);float t=smoothstep(0.0,1.0,strip.x);vec2 C1=p4-3.0*p3+3.0*p2-p1;vec2 C2=3.0*p3-6.0*p2+3.0*p1;vec2 C3=3.0*p2-3.0*p1;vec2 C4=p1;vec2 p;if(t==0.0){p=p1;}else if(t==1.0){p=p4;}else{p=C1*t*t*t+C2*t*t+C3*t+C4;}vec2 tangent=normalize(3.0*C1*t*t+2.0*C2*t+C3);vec2 normal=vec2(-tangent.y,tangent.x);float size=getScaled_size();if(size<pixelSize){opacity*=size/pixelSize;size=pixelSize;}float paddedSize=uPickingEnabled? max(size,uMinPickingSize): size+pixelSize;vNormalLengthInPixels=strip.y*paddedSize;if(uShape==SHAPE_ARC&&uArcFadingDistance[0]>0.0&&uArcFadingDistance[1]>0.0&&(!uNoFadingOnPointSelection||!isPointSelected())){float d=distanceFromLine(p1,p4,p);float distanceOpacity=smoothstep(uArcFadingDistance[1],uArcFadingDistance[0],d);opacity*=distanceOpacity;if(distanceOpacity<=0.0){vNormalLengthInPixels=0.0;}}p+=normal*vNormalLengthInPixels;gl_Position=pixelsToNdc(p);vec3 color=getScaled_color();vColor=vec4(color*opacity,opacity);vSize=paddedSize;setupPicking();}";
+const shader = "out vec4 vColor;out float vSize;out float vNormalLengthInPixels;out float vGamma;const int SHAPE_ARC=0;const int SHAPE_DOME=1;const int SHAPE_DIAGONAL=2;const int SHAPE_LINE=3;const int ORIENT_VERTICAL=0;const int ORIENT_HORIZONTAL=1;float distanceFromLine(vec2 pointOnLine1,vec2 pointOnLine2,vec2 point){vec2 a=point-pointOnLine1;vec2 b=pointOnLine2-pointOnLine1;vec2 proj=dot(a,b)/dot(b,b)*b;return length(a-proj);}bool isInsideViewport(vec2 point,float marginFactor){vec2 margin=uViewportSize*vec2(marginFactor);return point.x>=-margin.x&&point.x<=uViewportSize.x+margin.x&&point.y>=-margin.y&&point.y<=uViewportSize.y+margin.y;}void main(void){float pixelSize=1.0/uDevicePixelRatio;float opacity=getScaled_opacity()*uViewOpacity;vec2 p1,p2,p3,p4;vec2 a=applySampleFacet(vec2(getScaled_x(),getScaled_y()))*uViewportSize;vec2 b=applySampleFacet(vec2(getScaled_x2(),getScaled_y2()))*uViewportSize;if(uShape<=SHAPE_DOME){if(uShape==SHAPE_DOME){vec2 height=vec2(0.0);if(uOrient==ORIENT_VERTICAL){p1=vec2(min(a.x,b.x),b.y);p4=vec2(max(a.x,b.x),b.y);height=vec2(0.0,a.y-b.y);if(uClampApex){if(p4.x>0.0){p1.x=max(p1.x,-p4.x);}if(p1.x<uViewportSize.x){p4.x=min(p4.x,2.0*uViewportSize.x-p1.x);}}}else{p1=vec2(b.x,min(a.y,b.y));p4=vec2(b.x,max(a.y,b.y));height=vec2(a.x-b.x,0.0);if(uClampApex){if(p4.y>0.0){p1.y=max(p1.y,-p4.y);}if(p1.y<uViewportSize.y){p4.y=min(p4.y,2.0*uViewportSize.y-p1.y);}}}vec2 controlOffset=height/0.75;p2=p1+controlOffset;p3=p4+controlOffset;}if(uShape==SHAPE_ARC){p1=a;p4=b;vec2 chordVector=p4-p1;vec2 unitChordVector=normalize(chordVector);vec2 chordNormal=vec2(-unitChordVector.y,unitChordVector.x);float chordLength=length(chordVector);if(chordLength>uMaxChordLength){if(isInsideViewport(p1,2.0)){chordLength=uMaxChordLength;p4=p1+unitChordVector*uMaxChordLength;}else if(isInsideViewport(p4,2.0)){chordLength=uMaxChordLength;p1=p4-unitChordVector*uMaxChordLength;}}float height=max(chordLength/2.0*uArcHeightFactor,uMinArcHeight);vec2 controlOffset=chordNormal*height/0.75;p2=p1+controlOffset;p3=p4+controlOffset;}}else if(uShape==SHAPE_DIAGONAL){if(uOrient==ORIENT_VERTICAL){p1=a;p2=vec2(a.x,(a.y+b.y)/2.0);p3=vec2(b.x,(a.y+b.y)/2.0);p4=b;}else{p1=a;p2=vec2((a.x+b.x)/2.0,a.y);p3=vec2((a.x+b.x)/2.0,b.y);p4=b;}}else if(uShape==SHAPE_LINE){p1=a;p2=(a+b)/2.0;p3=p2;p4=b;}vec2 strip=vec2(float(gl_VertexID/2)/float(uSegmentBreaks),float(gl_VertexID % 2)-0.5);float t=smoothstep(0.0,1.0,strip.x);vec2 C1=p4-3.0*p3+3.0*p2-p1;vec2 C2=3.0*p3-6.0*p2+3.0*p1;vec2 C3=3.0*p2-3.0*p1;vec2 C4=p1;vec2 p;if(t==0.0){p=p1;}else if(t==1.0){p=p4;}else{p=C1*t*t*t+C2*t*t+C3*t+C4;}vec2 tangent=normalize(3.0*C1*t*t+2.0*C2*t+C3);vec2 normal=vec2(-tangent.y,tangent.x);float size=getScaled_size();if(size<pixelSize){opacity*=size/pixelSize;size=pixelSize;}float paddedSize=uPickingEnabled? max(size,uMinPickingSize): size+pixelSize;vNormalLengthInPixels=strip.y*paddedSize;if(uShape==SHAPE_ARC&&uArcFadingDistance[0]>0.0&&uArcFadingDistance[1]>0.0&&(!uNoFadingOnPointSelection||!isPointSelected())){float d=distanceFromLine(p1,p4,p);float distanceOpacity=smoothstep(uArcFadingDistance[1],uArcFadingDistance[0],d);opacity*=distanceOpacity;if(distanceOpacity<=0.0){vNormalLengthInPixels=0.0;}}p+=normal*vNormalLengthInPixels;gl_Position=pixelsToNdc(p);vec3 color=getScaled_color();vColor=vec4(color*opacity,opacity);vGamma=getGammaForColor(color);vSize=paddedSize;setupPicking();}";
 export default shader;

package/dist/src/marks/mark.d.ts

@@ -12,9 +12,11 @@ export const SAMPLE_FACET_TEXTURE: "SAMPLE_FACET_TEXTURE";
  * @callback DrawFunction
  * @param {number} offset
  * @param {number} count
- *
  */
-export default class Mark {
+/**
+ * @template {MarkProps} [P=MarkProps]
+ */
+export default class Mark<P extends import("../spec/mark.js").MarkProps = import("../spec/mark.js").MarkProps> {
     /**
      * @param {import("../view/unitView.js").default} unitView
      */
@@ -69,25 +71,28 @@ export default class Mark {
     protected markUniformsAltered: boolean;
     /** @type {RangeMap<any>} keep track of facet locations within the vertex array */
     rangeMap: RangeMap<any>;
-    /** @type {MarkProps} */
-    defaultProperties: import("../spec/mark.js").MarkProps;
+    defaultProperties: P;
     /**
      * A properties object that contains the configured mark properties or
      * default values as fallback.
      *
-     * TODO: Proper and comprehensive typings for mark properties
-     *
-     * @type {Partial<MarkProps>}
+     * @type {P}
      * @readonly
      */
-    readonly properties: Partial<import("../spec/mark.js").MarkProps>;
+    readonly properties: P;
+    /**
+     * @param {Partial<P>} props
+     * @protected
+     */
+    protected augmentDefaultProperties(props: Partial<P>): void;
     get opaque(): boolean;
     /**
      * Returns attribute info for WebGL attributes that match visual channels.
      *
-     * @returns {string[]}
+     * @returns {import("../spec/channel.js").Channel[]}
+     * @protected
      */
-    getAttributes(): string[];
+    protected getAttributes(): import("../spec/channel.js").Channel[];
     /**
      * @returns {Channel[]}
      */
@@ -107,10 +112,10 @@ export default class Mark {
      * Handles dynamic properties that are not bound to uniforms but need
      * to trigger a graphics update, i.e., rebuild the vertex buffer.
      *
-     * @param {(keyof MarkProps)[]} props
+     * @param {(keyof P)[]} props
      * @protected
      */
-    protected setupExprRefsNeedingGraphicsUpdate(props: (keyof import("../spec/mark.js").MarkProps)[]): void;
+    protected setupExprRefsNeedingGraphicsUpdate(props: (keyof P)[]): void;
     /**
      * Returns the encoding spec supplemented with mark's default encodings
      *
@@ -118,7 +123,7 @@ export default class Mark {
      */
     get encoding(): import("../spec/channel.js").Encoding;
     getContext(): import("../types/viewContext.js").default;
-    getType(): import("../spec/mark.js").MarkType;
+    getType(): "link" | "rect" | "text" | "point" | "rule";
     initializeData(): void;
     /**
      * Initialize encoders that encode fields of the data (or constants) to
@@ -195,9 +200,6 @@ export default class Mark {
     isReady(): import("twgl.js").ProgramInfo;
     /**
      * Returns true if this mark instance participates in picking.
-     *
-     * TODO: Check if tooltip is enabled,
-     * TODO: Check if selection (when it's implemented) is enabled
      */
     isPickingParticipant(): boolean;
     /**

package/dist/src/marks/mark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":";AAoDA,0DAA2D;AAC3D,0DAA2D;AAE3D;;;;;;;;;;;;GAYG;AACH;IAgBI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAuG/C;IApGG,gDAAwB;IAExB,8EAA8E;IAC9E,uGAAyB;IAIzB;;;OAGG;IACH,sBAHU,OAAO,SAAS,EAAE,UAAU,GAAG;QAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAAE,CAG5C;IAE3B;;;;;;;OAOG;IACH,2BAHU,IAAI,MAAM,EAAE,MAAM,CAAC,CAGG;IAEhC;;;OAGG;IACH,uBAHU,OAAO,SAAS,EAAE,WAAW,CAGX;IAE5B;;;OAGG;IACH,2BAHU,OAAO,SAAS,EAAE,eAAe,CAGX;IAEhC;;;OAGG;IACH,2BAHU,OAAO,SAAS,EAAE,gBAAgB,CAGZ;IAEhC;;;;;OAKG;IACH,2BAHU,OAAO,SAAS,EAAE,gBAAgB,CAGZ;IAEhC;;;;;OAKG;IACH,uCAA+B;IAE/B,kFAAkF;IAClF,UADW,SAAS,GAAG,CAAC,CACM;IAG9B,wBAAwB;IACxB,uDAqBC;IAED;;;;;;;;OAQG;IACH,kEAKC;IAGL,sBAEC;IAED;;;;OAIG;IACH,iBAFa,MAAM,EAAE,CAKpB;IAED;;OAEG;IACH,+DAWC;IAED;;OAEG;IACH,4DAcC;IAED;;;;;OAKG;IACH,oGAEC;IAED;;;;;;OAMG;IACH,yGAkCC;IAED;;;;OAIG;IACH,sDAiDC;IAED,wDAEC;IAED,8CAEC;IAED,uBAEC;IAED;;;OAGG;IACH,2BAEC;IAED;;OAEG;IACH,oCAEC;IAED;;OAEG;IACH,2BAEC;IAED,sEAeC;IAED;;;;;;OAMG;IAEH,6CANW,MAAM,kBACN,MAAM,iBACN,MAAM,EAAE,QA8UlB;IALG;;;;;;MAIC;IAGL;;;;;;OAMG;IACH,uCA6CC;IAED;;;;;;OAMG;IACH,+CAHW,MAAM,UACK,GAAG,KAAE,IAAI,CAe9B;IAED;;;;;;;;;;OAUG;IACH,mDAJW,MAAM,sFAEsB,GAAG,QA6BzC;IAED;;OAEG;IACH,2BAwBC;IAED;;;OAGG;IACH,6BAFW,GAAG,QAyCb;IAED,yBAAyB;IACzB,uDAEC;IAED,yBAAyB;IACzB,iCAEC;IAED,gCAEC;IAED,+BAEC;IAED,yCAEC;IAED;;;;;OAKG;IACH,gCAcC;IAED;;OAEG;IACH,4CAOC;IAED;;;;;;;;OAQG;IAEH,uBAJW,OAAO,uBAAuB,EAAE,sBAAsB,GACpD,CAAC,MAAM,IAAI,CAAC,EAAE,CAsF1B;IAED;;;;;;OAMG;IACH,qCAJW,oBAAoB,GAClB,OAAO,CAqCnB;IAED;;;;;;;OAOG;IACH,gBAJW,oBAAoB,SACP,IAAI,CAM3B;IAED;;;OAGG;IACH,2BAHW,YAAY,WACZ,OAAO,WAAW,EAAE,oBAAoB,cAiElD;IAED;;;;;;OAMG;IACH,oBAJW,OAAO,6BAA6B,EAAE,OAAO,aAC7C,OAAO,6BAA6B,EAAE,OAAO,GAC3C,OAAO,CAuHnB;IAED;;;;;;;;;OASG;IACH,qBAJW,MAAM,KACN,OAAO,oBAAoB,EAAE,MAAM,GACjC,GAAG,CAIf;;CACJ;+BAvwCY,OAAO,uBAAuB,EAAE,gBAAgB;;;;;;wBAEnD,OAAO;;mCAEJ,gBAAgB,GAAG,qBAAqB;oCAG1C,MAAM,SACN,MAAM;AAiwCjB;;;GAGG;AACH;IACI,cAEC;IAkBD;;;OAGG;IACH,2BAFW,IAAI,CAAC,EAAE,OAAO,yBAAyB,EAAE,UAAU,CAAC,QAiB9D;CACJ;0BAj0CyB,WAAW"}
+{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}

package/dist/src/marks/mark.js

@@ -64,7 +64,10 @@ export const SAMPLE_FACET_TEXTURE = "SAMPLE_FACET_TEXTURE";
  * @callback DrawFunction
  * @param {number} offset
  * @param {number} count
- *
+ */
+
+/**
+ * @template {MarkProps} [P=MarkProps]
  */
 export default class Mark {
     /**
@@ -146,9 +149,8 @@ export default class Mark {
         /** @type {RangeMap<any>} keep track of facet locations within the vertex array */
         this.rangeMap = new RangeMap();
 
-        // TODO: Implement https://vega.github.io/vega-lite/docs/config.html
-        /** @type {MarkProps} */
-        this.defaultProperties = {
+        // TODO: Implement config: https://vega.github.io/vega-lite/docs/config.html
+        this.defaultProperties = /** @type {P} */ ({
             get clip() {
                 // TODO: Cache once the scales have been resolved
                 // TODO: Only check channels that are used
@@ -169,25 +171,34 @@ export default class Mark {
              * This property is intended for internal usage.
              */
             minBufferSize: 0,
-        };
+        });
 
         /**
          * A properties object that contains the configured mark properties or
          * default values as fallback.
          *
-         * TODO: Proper and comprehensive typings for mark properties
-         *
-         * @type {Partial<MarkProps>}
+         * @type {P}
          * @readonly
          */
         this.properties = coalesceProperties(
             typeof this.unitView.spec.mark == "object"
-                ? () => /** @type {MarkProps} */ (this.unitView.spec.mark)
-                : () => /** @type {MarkProps} */ ({}),
+                ? () => /** @type {P} */ (this.unitView.spec.mark)
+                : () => /** @type {P} */ ({}),
             () => this.defaultProperties
         );
     }
 
+    /**
+     * @param {Partial<P>} props
+     * @protected
+     */
+    augmentDefaultProperties(props) {
+        Object.defineProperties(
+            this.defaultProperties,
+            Object.getOwnPropertyDescriptors(props)
+        );
+    }
+
     get opaque() {
         return false;
     }
@@ -195,7 +206,8 @@ export default class Mark {
     /**
      * Returns attribute info for WebGL attributes that match visual channels.
      *
-     * @returns {string[]}
+     * @returns {import("../spec/channel.js").Channel[]}
+     * @protected
      */
     getAttributes() {
         // override
@@ -251,7 +263,7 @@ export default class Mark {
      * Handles dynamic properties that are not bound to uniforms but need
      * to trigger a graphics update, i.e., rebuild the vertex buffer.
      *
-     * @param {(keyof MarkProps)[]} props
+     * @param {(keyof P)[]} props
      * @protected
      */
     setupExprRefsNeedingGraphicsUpdate(props) {
@@ -951,13 +963,12 @@ export default class Mark {
 
     /**
      * Returns true if this mark instance participates in picking.
-     *
-     * TODO: Check if tooltip is enabled,
-     * TODO: Check if selection (when it's implemented) is enabled
      */
     isPickingParticipant() {
-        // TODO: Should check encoding instead
-        if (this.properties.tooltip === null) {
+        if (
+            this.properties.tooltip === null &&
+            !this.unitView.paramMediator.hasPointSelections()
+        ) {
             // Disabled
             return false;
         }
@@ -1270,14 +1281,14 @@ export default class Mark {
             // Because glViewport accepts only integers, we subtract the rounding
             // errors from xyOffsets to guarantee that graphics in clipped
             // and non-clipped viewports align correctly
-            const roundedCoords = physicalGlCoords.map((x) => Math.round(x));
-            const [xError, yError] = physicalGlCoords.map(
-                (x, i) => x - roundedCoords[i]
-            );
+            const roundedCoords =
+                /** @type {[number, number, number, number]} */ (
+                    physicalGlCoords.map((x) => Math.floor(x))
+                );
+            const xError = physicalGlCoords[0] - roundedCoords[0];
+            const yError = physicalGlCoords[1] - roundedCoords[1];
 
-            // @ts-ignore
             gl.viewport(...roundedCoords);
-            // @ts-ignore
             gl.scissor(...roundedCoords);
             gl.enable(gl.SCISSOR_TEST);
 

package/dist/src/marks/markUtils.d.ts

@@ -18,6 +18,31 @@ export function fixStroke(encoding: import("../spec/channel.js").Encoding, fille
  * @param {boolean} filled
  */
 export function fixFill(encoding: import("../spec/channel.js").Encoding, filled: boolean): void;
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").PointProps}
+ */
+export function isPointProps(props: import("../spec/mark.js").MarkProps): props is import("../spec/mark.js").PointProps;
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").RectProps}
+ */
+export function isRectProps(props: import("../spec/mark.js").MarkProps): props is import("../spec/mark.js").RectProps;
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").RuleProps}
+ */
+export function isRuleProps(props: import("../spec/mark.js").MarkProps): props is import("../spec/mark.js").RuleProps;
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").TextProps}
+ */
+export function isTextProps(props: import("../spec/mark.js").MarkProps): props is import("../spec/mark.js").TextProps;
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").LinkProps}
+ */
+export function isLinkProps(props: import("../spec/mark.js").MarkProps): props is import("../spec/mark.js").LinkProps;
 export type Encoding = import("../spec/channel.js").Encoding;
 export type Channel = import("../spec/channel.js").Channel;
 //# sourceMappingURL=markUtils.d.ts.map

package/dist/src/marks/markUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markUtils.d.ts","sourceRoot":"","sources":["../../../src/marks/markUtils.js"],"names":[],"mappings":"AAMA;;;;GAIG;AAEH;;;GAGG;AACH,wCAHW,QAAQ,WACR,OAAO,oBAAoB,EAAE,wBAAwB,QAoD/D;AAED;;;GAGG;AACH,oCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAyBjB;AAED;;;GAGG;AACH,kCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAyBjB;uBApHY,OAAO,oBAAoB,EAAE,QAAQ;sBACrC,OAAO,oBAAoB,EAAE,OAAO"}
+{"version":3,"file":"markUtils.d.ts","sourceRoot":"","sources":["../../../src/marks/markUtils.js"],"names":[],"mappings":"AAMA;;;;GAIG;AAEH;;;GAGG;AACH,wCAHW,QAAQ,WACR,OAAO,oBAAoB,EAAE,wBAAwB,QAoD/D;AAED;;;GAGG;AACH,oCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAyBjB;AAED;;;GAGG;AACH,kCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAyBjB;AAED;;;GAGG;AACH,oCAHW,OAAO,iBAAiB,EAAE,SAAS,iDAK7C;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,gDAK7C;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,gDAK7C;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,gDAK7C;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,gDAK7C;uBA5JY,OAAO,oBAAoB,EAAE,QAAQ;sBACrC,OAAO,oBAAoB,EAAE,OAAO"}

package/dist/src/marks/markUtils.js

@@ -37,7 +37,7 @@ export function fixPositional(encoding, channel) {
         if (!secondary) {
             if (primary.type == "quantitative") {
                 // Bar plot, anchor the other end to zero
-                secondary = { datum: 0 };
+                secondary = { datum: 0, contributesToScaleDomain: false };
             } else {
                 secondary = { ...primary };
 
@@ -123,3 +123,43 @@ export function fixFill(encoding, filled) {
         }
     }
 }
+
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").PointProps}
+ */
+export function isPointProps(props) {
+    return props.type === "point";
+}
+
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").RectProps}
+ */
+export function isRectProps(props) {
+    return props.type === "point";
+}
+
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").RuleProps}
+ */
+export function isRuleProps(props) {
+    return props.type === "point";
+}
+
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").TextProps}
+ */
+export function isTextProps(props) {
+    return props.type === "point";
+}
+
+/**
+ * @param {import("../spec/mark.js").MarkProps} props
+ * @returns {props is import("../spec/mark.js").LinkProps}
+ */
+export function isLinkProps(props) {
+    return props.type === "point";
+}

package/dist/src/marks/point.common.glsl.js

@@ -1,2 +1,2 @@
-const shader = "layout(std140)uniform Mark{/***The stroke should only grow inwards,e.g,the diameter/outline is not affected by the stroke width.*Thus,a point that has a zero size has no visible stroke. This allows strokes to be used with*geometric zoom,etc.*/uniform bool uInwardStroke;uniform mediump float uScaleFactor;uniform mediump float uZoomLevel;uniform highp float uSemanticThreshold;uniform mediump float uGradientStrength;\n#pragma markUniforms\n};";
+const shader = "layout(std140)uniform Mark{/***The stroke should only grow inwards,e.g,the diameter/outline is not affected by the stroke width.*Thus,a point that has a zero size has no visible stroke. This allows strokes to be used with*geometric zoom,etc.*/uniform bool uInwardStroke;uniform float uMinPickingSize;uniform mediump float uScaleFactor;uniform mediump float uZoomLevel;uniform highp float uSemanticThreshold;uniform mediump float uGradientStrength;\n#pragma markUniforms\n};";
 export default shader;

package/dist/src/marks/point.d.ts

@@ -1,4 +1,11 @@
-export default class PointMark extends Mark {
+/**
+ * @extends {Mark<import("../spec/mark.js").PointProps>}
+ */
+export default class PointMark extends Mark<import("../spec/mark.js").PointProps> {
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     sampledSemanticScores: Float32Array;
     getSemanticThreshold(): number;
     #private;

package/dist/src/marks/point.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/marks/point.js"],"names":[],"mappings":"AAmBA;IA0HY,oCAMC;IAiET,+BAkBC;;CAgDJ;iBA3QgB,WAAW"}
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/marks/point.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH;IAGI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EA6C/C;IA0EO,oCAMC;IAkET,+BAkBC;;CAgDJ;iBAhRgB,WAAW"}

package/dist/src/marks/point.js

@@ -17,6 +17,9 @@ import { fixFill, fixStroke } from "./markUtils.js";
 /** @type {Record<string, import("../spec/channel.js").ChannelDef>} */
 const defaultEncoding = {};
 
+/**
+ * @extends {Mark<import("../spec/mark.js").PointProps>}
+ */
 export default class PointMark extends Mark {
     #semanticZoomFraction = () => 0;
 
@@ -26,28 +29,28 @@ export default class PointMark extends Mark {
     constructor(unitView) {
         super(unitView);
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                x: 0.5,
-                y: 0.5,
-                color: "#4c78a8",
-                filled: true,
-                opacity: 1.0,
-                size: 100.0,
-                semanticScore: 0.0, // TODO: Should be datum instead of value. But needs fixing.
-                shape: "circle",
-                strokeWidth: 2.0,
-                fillGradientStrength: 0.0,
-                dx: 0,
-                dy: 0,
-                angle: 0,
-
-                sampleFacetPadding: 0.1,
-
-                semanticZoomFraction: 0.02,
-            })
-        );
+        this.augmentDefaultProperties({
+            x: 0.5,
+            y: 0.5,
+            color: "#4c78a8",
+            filled: true,
+            opacity: 1.0,
+            size: 100.0,
+            // @ts-expect-error - TODO: Should be datum instead of value. But needs fixing.
+            semanticScore: 0.0,
+            shape: "circle",
+            strokeWidth: 2.0,
+            fillGradientStrength: 0.0,
+            dx: 0,
+            dy: 0,
+            angle: 0,
+
+            sampleFacetPadding: 0.1,
+
+            semanticZoomFraction: 0.02,
+
+            minPickingSize: 2.0,
+        });
 
         // TODO: This mess should be simplified
         // TODO: createExpression should accept constant values or ExprRefs and allow
@@ -68,9 +71,11 @@ export default class PointMark extends Mark {
         }
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
-            "inwardStroke",
             "uniqueId",
             "facetIndex",
             "x",
@@ -79,7 +84,6 @@ export default class PointMark extends Mark {
             "semanticScore",
             "shape",
             "strokeWidth",
-            "gradientStrength",
             "dx",
             "dy",
             "fill",
@@ -173,6 +177,7 @@ export default class PointMark extends Mark {
             "uGradientStrength",
             props.fillGradientStrength
         );
+        this.registerMarkUniformValue("uMinPickingSize", props.minPickingSize);
     }
 
     updateGraphicsData() {

package/dist/src/marks/point.vertex.glsl.js

@@ -1,2 +1,2 @@
-const shader = "out float vRadius;out float vRadiusWithPadding;out lowp vec4 vFillColor;out lowp vec4 vStrokeColor;out lowp float vShape;out lowp float vHalfStrokeWidth;out mat2 vRotationMatrix;const float CIRCLE=0.0;const float SQUARE=1.0;const float CROSS=2.0;const float DIAMOND=3.0;const float TRIANGLE_UP=4.0;const float TRIANGLE_RIGHT=5.0;const float TRIANGLE_DOWN=6.0;const float TRIANGLE_LEFT=7.0;const float TICK_UP=8.0;const float TICK_RIGHT=9.0;const float TICK_DOWN=10.0;const float TICK_LEFT=11.0;float computeSemanticThresholdFactor(){return getScaled_semanticScore()>=uSemanticThreshold ? 1.0 : 0.0;}vec2 getDxDy(){\n#if defined(dx_DEFINED) || defined(dy_DEFINED)\nreturn vec2(getScaled_dx(),getScaled_dy())/uViewportSize;\n#else\nreturn vec2(0.0,0.0);\n#endif\n}void main(void){float shapeAngle=0.0;float semanticThresholdFactor=computeSemanticThresholdFactor();if(semanticThresholdFactor<=0.0){gl_PointSize=0.0;gl_Position=vec4(100.0,0.0,0.0,0.0);return;}float size=getScaled_size();vec2 pos=vec2(getScaled_x(),getScaled_y())+getDxDy();gl_Position=unitToNdc(applySampleFacet(pos));float strokeWidth=getScaled_strokeWidth();float diameter=sqrt(size)*uScaleFactor*semanticThresholdFactor;float opacity=uViewOpacity;if(strokeWidth<=0.0||uInwardStroke){float minDiameter=1.0/uDevicePixelRatio;if(diameter<minDiameter){opacity*=pow(diameter/minDiameter,2.5);diameter=minDiameter;}}float fillOpa=getScaled_fillOpacity()*opacity;float strokeOpa=getScaled_strokeOpacity()*opacity;vShape=getScaled_shape();bool circle=vShape==0.0;if(vShape>TICK_UP&&vShape<=TICK_LEFT){shapeAngle=(vShape-TICK_UP)*90.0;vShape=TICK_UP;}else if(vShape>TRIANGLE_UP&&vShape<=TRIANGLE_LEFT){shapeAngle=(vShape-TRIANGLE_UP)*90.0;vShape=TRIANGLE_UP;}float angleInDegrees=getScaled_angle();float angle=-(shapeAngle+angleInDegrees)*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);vRotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);float roomForRotation=circle ? 1.0 : sin(mod(angle,PI/2.0)+PI/4.0)/sin(PI/4.0);float aaPadding=1.0/uDevicePixelRatio;float rotationPadding=(diameter*roomForRotation)-diameter;float strokePadding=uInwardStroke ? 0.0 : strokeWidth*(circle ? 1.0 : sqrt(3.0));float padding=rotationPadding+strokePadding+aaPadding;gl_PointSize=(diameter+padding)*uDevicePixelRatio;vRadius=diameter/2.0;vRadiusWithPadding=vRadius+padding/2.0;vHalfStrokeWidth=strokeWidth/2.0;vFillColor=vec4(getScaled_fill()*fillOpa,fillOpa);vStrokeColor=vec4(getScaled_stroke()*strokeOpa,strokeOpa);setupPicking();}";
+const shader = "out float vRadius;out float vRadiusWithPadding;out lowp vec4 vFillColor;out lowp vec4 vStrokeColor;out lowp float vShape;out lowp float vHalfStrokeWidth;out mat2 vRotationMatrix;const float CIRCLE=0.0;const float SQUARE=1.0;const float CROSS=2.0;const float DIAMOND=3.0;const float TRIANGLE_UP=4.0;const float TRIANGLE_RIGHT=5.0;const float TRIANGLE_DOWN=6.0;const float TRIANGLE_LEFT=7.0;const float TICK_UP=8.0;const float TICK_RIGHT=9.0;const float TICK_DOWN=10.0;const float TICK_LEFT=11.0;float computeSemanticThresholdFactor(){return getScaled_semanticScore()>=uSemanticThreshold ? 1.0 : 0.0;}vec2 getDxDy(){\n#if defined(dx_DEFINED) || defined(dy_DEFINED)\nreturn vec2(getScaled_dx(),getScaled_dy())/uViewportSize;\n#else\nreturn vec2(0.0,0.0);\n#endif\n}void main(void){float shapeAngle=0.0;float semanticThresholdFactor=computeSemanticThresholdFactor();if(semanticThresholdFactor<=0.0){gl_PointSize=0.0;gl_Position=vec4(100.0,0.0,0.0,0.0);return;}float size=getScaled_size();vec2 pos=vec2(getScaled_x(),getScaled_y())+getDxDy();gl_Position=unitToNdc(applySampleFacet(pos));float strokeWidth=getScaled_strokeWidth();float diameter=sqrt(size)*uScaleFactor*semanticThresholdFactor;float opacity=uViewOpacity;if(strokeWidth<=0.0||uInwardStroke){float minDiameter=1.0/uDevicePixelRatio;if(diameter<minDiameter){opacity*=pow(diameter/minDiameter,2.5);diameter=minDiameter;}}float fillOpa=getScaled_fillOpacity()*opacity;float strokeOpa=getScaled_strokeOpacity()*opacity;vShape=getScaled_shape();bool circle=vShape==0.0;if(vShape>TICK_UP&&vShape<=TICK_LEFT){shapeAngle=(vShape-TICK_UP)*90.0;vShape=TICK_UP;}else if(vShape>TRIANGLE_UP&&vShape<=TRIANGLE_LEFT){shapeAngle=(vShape-TRIANGLE_UP)*90.0;vShape=TRIANGLE_UP;}float angleInDegrees=getScaled_angle();float angle=-(shapeAngle+angleInDegrees)*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);vRotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);float roomForRotation=circle ? 1.0 : sin(mod(angle,PI/2.0)+PI/4.0)/sin(PI/4.0);float aaPadding=1.0/uDevicePixelRatio;float rotationPadding=(diameter*roomForRotation)-diameter;float strokePadding=uInwardStroke ? 0.0 : strokeWidth*(circle ? 1.0 : sqrt(3.0));float padding=rotationPadding+strokePadding+aaPadding;gl_PointSize=max((diameter+padding),uPickingEnabled ? uMinPickingSize : 0.0)*uDevicePixelRatio;vRadius=diameter/2.0;vRadiusWithPadding=vRadius+padding/2.0;vHalfStrokeWidth=strokeWidth/2.0;vFillColor=vec4(getScaled_fill()*fillOpa,fillOpa);vStrokeColor=vec4(getScaled_stroke()*strokeOpa,strokeOpa);setupPicking();}";
 export default shader;

package/dist/src/marks/rect.d.ts

@@ -1,4 +1,11 @@
-export default class RectMark extends Mark {
+/**
+ * @extends {Mark<import("../spec/mark.js").RectProps>}
+ */
+export default class RectMark extends Mark<import("../spec/mark.js").RectProps> {
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     /**
      * Finds a datum that overlaps the given value on the x domain.
      * The result is unspecified if multiple data are found.

package/dist/src/marks/rect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/marks/rect.js"],"names":[],"mappings":"AAaA;IA8NI;;;;;;;;;;OAUG;IACH,8BALW,GAAG,KACH,OAAO,oBAAoB,EAAE,MAAM,GACjC,GAAG,CAyBf;;CACJ;iBAvQgB,WAAW"}
+{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/marks/rect.js"],"names":[],"mappings":"AAaA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAkB/C;IAuMD;;;;;;;;;;OAUG;IACH,8BALW,GAAG,KACH,OAAO,oBAAoB,EAAE,MAAM,GACjC,GAAG,CAyBf;;CACJ;iBAvQgB,WAAW"}