fabric 6.0.0-beta14 → 6.0.0-beta15

package/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## [next]
 
-## [6.0.0-beta13]
+## [6.0.0-beta14]
+
+- Fix(SVGParser) ignore missing xlink target issue on svg parsing (#9427) [#9109](https://github.com/fabricjs/fabric.js/issues/9109)
+- fix(#9172): dep export `Object`, `Text`, `Image` [#9433](https://github.com/fabricjs/fabric.js/pull/9433)
+
+## [6.0.0-beta14]
 
 - fix(Object): fixes centeredScaling prop type [#9401](https://github.com/fabricjs/fabric.js/pull/9401)
 - CI(): fix build caching + tests when merging to master [#9404](https://github.com/fabricjs/fabric.js/pull/9404)

package/dist/fabric.d.ts

@@ -30,7 +30,18 @@ export { PencilBrush } from './src/brushes/PencilBrush';
 export { CircleBrush } from './src/brushes/CircleBrush';
 export { SprayBrush } from './src/brushes/SprayBrush';
 export { PatternBrush } from './src/brushes/PatternBrush';
-export { FabricObject, _Object as Object, } from './src/shapes/Object/FabricObject';
+export { FabricObject, 
+/**
+ * @deprecated Due to a naming conflict with the
+ * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object JS API},
+ * `fabric.Object` has been renamed to `FabricObject`
+ *
+ * @example
+ * import { Object } from 'fabric'; // deprecated
+ * import { FabricObject } from 'fabric'; // migration path
+ *
+ */
+FabricObject as Object, } from './src/shapes/Object/FabricObject';
 export type { TFabricObjectProps, FabricObjectProps, SerializedObjectProps, } from './src/shapes/Object/types';
 export type { SerializedLineProps } from './src/shapes/Line';
 export { Line } from './src/shapes/Line';
@@ -47,7 +58,18 @@ export type { SerializedPolylineProps } from './src/shapes/Polyline';
 export { Polyline } from './src/shapes/Polyline';
 export { Polygon } from './src/shapes/Polygon';
 export type { GraphemeBBox, SerializedTextProps, TPathAlign, TPathSide, TextProps, } from './src/shapes/Text/Text';
-export { Text, FabricText } from './src/shapes/Text/Text';
+export { FabricText, 
+/**
+ * @deprecated Due to a naming conflict with the
+ * {@link https://developer.mozilla.org/en-US/docs/Web/API/Text/Text Web API},
+ * `fabric.Text` has been renamed to `FabricText`
+ *
+ * @example
+ * import { Text } from 'fabric'; // deprecated
+ * import { FabricText } from 'fabric'; // migration path
+ *
+ */
+FabricText as Text, } from './src/shapes/Text/Text';
 export type { ITextProps, SerializedITextProps, } from './src/shapes/IText/IText';
 export { IText } from './src/shapes/IText/IText';
 export type { GraphemeData, SerializedTextboxProps, TextboxProps, } from './src/shapes/Textbox';
@@ -57,7 +79,18 @@ export type { GroupEvents, GroupProps, LayoutContext, GroupOwnProps, LayoutConte
 export { Group } from './src/shapes/Group';
 export type { ActiveSelectionOptions, MultiSelectionStacking, } from './src/shapes/ActiveSelection';
 export { ActiveSelection } from './src/shapes/ActiveSelection';
-export { Image, FabricImage } from './src/shapes/Image';
+export { FabricImage, 
+/**
+ * @deprecated Due to a naming conflict with the
+ * {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/Image Web API},
+ * `fabric.Image` has been renamed to `FabricImage`
+ *
+ * @example
+ * import { Image } from 'fabric'; // deprecated
+ * import { FabricImage } from 'fabric'; // migration path
+ *
+ */
+FabricImage as Image, } from './src/shapes/Image';
 export type { ImageSource, SerializedImageProps, ImageProps, } from './src/shapes/Image';
 export { createCollectionMixin } from './src/Collection';
 export * as util from './src/util';

package/dist/index.js

@@ -419,7 +419,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.0.0-beta14";
+  var version = "6.0.0-beta15";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -9758,14 +9758,6 @@
   classRegistry.setClass(FabricObject);
   classRegistry.setClass(FabricObject, 'object');
 
-  /**
-   * @deprecated The old fabric.Object class can't be imported as Object because of conflict with the JS api
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object
-   * For this reason it has been renamed to FabricObject.
-   * Please use `import { FabricObject }` in place of `import { Object as FabricObject }`
-   */
-  class _Object extends FabricObject {}
-
   /**
    * Returns true if context has transparent pixel
    * at specified location (taking tolerance into account)
@@ -20135,14 +20127,6 @@
   classRegistry.setClass(FabricText);
   classRegistry.setSVGClass(FabricText);
 
-  /**
-   * @deprecated The old fabric.Text class can't be imported as Text because of conflict with Web API.
-   * https://developer.mozilla.org/en-US/docs/Web/API/Text/Text
-   * For this reason it has been renamed to FabricText.
-   * Please use `import { FabricText }` in place of `import { Text as FabricText }`
-   */
-  class Text extends FabricText {}
-
   /**
    * #### Dragging IText/Textbox Lifecycle
    * - {@link start} is called from `mousedown` {@link IText#_mouseDownHandler} and determines if dragging should start by testing {@link isPointerOverSelection}
@@ -24351,14 +24335,6 @@
   classRegistry.setClass(FabricImage);
   classRegistry.setSVGClass(FabricImage);
 
-  /**
-   * @deprecated The old fabric.Image class can't be imported as Image because of conflict with Web API.
-   * https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/Image
-   * For this reason it has been renamed to FabricImage.
-   * Please use `import { FabricImage }` in place of `import { Image as FabricImage }`
-   */
-  class Image extends FabricImage {}
-
   /**
    * Add a <g> element that envelop all child elements and makes the viewbox transformMatrix descend on all elements
    */
@@ -24493,25 +24469,6 @@
     return false;
   }
 
-  /**
-   * @private
-   * TODO: verify if this is still needed
-   * to support IE8 missing getElementById on SVGdocument and on node xmlDOM
-   */
-  function elementById(doc, id) {
-    if (doc.getElementById) {
-      return doc.getElementById(id);
-    }
-    const nodelist = doc.getElementsByTagName('*');
-    for (let i = 0, len = nodelist.length; i < len; i++) {
-      const node = nodelist[i];
-      if (id === node.getAttribute('id')) {
-        return node;
-      }
-    }
-    return null;
-  }
-
   function getMultipleNodes(doc, nodeNames) {
     let nodeName,
       nodeArray = [],
@@ -24538,7 +24495,12 @@
       const xlink = xlinkAttribute.slice(1);
       const x = el.getAttribute('x') || 0;
       const y = el.getAttribute('y') || 0;
-      let el2 = elementById(doc, xlink).cloneNode(true);
+      const el2Orig = doc.getElementById(xlink);
+      if (el2Orig === null) {
+        // if we can't find the target of the xlink, consider this use tag bad, similar to no xlink
+        return;
+      }
+      let el2 = el2Orig.cloneNode(true);
       let currentTrans = (el2.getAttribute('transform') || '') + ' translate(' + x + ', ' + y + ')';
       const oldLength = nodelist.length;
       const namespace = svgNS;
@@ -24590,7 +24552,7 @@
   function recursivelyParseGradientsXlink(doc, gradient) {
     var _gradient$getAttribut;
     const xLink = ((_gradient$getAttribut = gradient.getAttribute(xlinkAttr)) === null || _gradient$getAttribut === void 0 ? void 0 : _gradient$getAttribut.slice(1)) || '',
-      referencedGradient = elementById(doc, xLink);
+      referencedGradient = doc.getElementById(xLink);
     if (referencedGradient && referencedGradient.getAttribute(xlinkAttr)) {
       recursivelyParseGradientsXlink(doc, referencedGradient);
     }
@@ -27686,10 +27648,10 @@
   exports.Gradient = Gradient;
   exports.Group = Group;
   exports.IText = IText;
-  exports.Image = Image;
+  exports.Image = FabricImage;
   exports.Intersection = Intersection;
   exports.Line = Line;
-  exports.Object = _Object;
+  exports.Object = FabricObject;
   exports.Observable = Observable;
   exports.Path = Path;
   exports.Pattern = Pattern;
@@ -27703,7 +27665,7 @@
   exports.SprayBrush = SprayBrush;
   exports.StaticCanvas = StaticCanvas;
   exports.StaticCanvasDOMManager = StaticCanvasDOMManager;
-  exports.Text = Text;
+  exports.Text = FabricText;
   exports.Textbox = Textbox;
   exports.Triangle = Triangle;
   exports.WebGLFilterBackend = WebGLFilterBackend;