Merge branch 'master' into collection-stacking

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - fix(Object Stacking): 🔙 refactor logic to support Group 🔝
 - chore(TS): migrate Group/ActiveSelection [#8455](https://github.com/fabricjs/fabric.js/pull/8455)
+- chore(TS): Move object classes #8511
 - chore(TS): polish text [#8489](https://github.com/fabricjs/fabric.js/pull/8489)
 - chore(TS): fix import cycle, extract `groupSVGElements` [#8506](https://github.com/fabricjs/fabric.js/pull/8506)
 - chore(TS): permissive `Point` typings [#8434](https://github.com/fabricjs/fabric.js/pull/8434)

index.js

@@ -19,6 +19,7 @@ import './src/mixins/canvas_gestures.mixin'; // optional gestures
 import './src/mixins/canvas_animation.mixin'; // optional animation
 import './src/mixins/canvas_straightening.mixin'; // optional animation
 import './src/shapes/fabricObject.class';
+import './src/shapes/Object/FabricObject';
 import './src/mixins/stateful.mixin'; // will die soon
 import './src/shapes/line.class';
 import './src/shapes/circle.class';

src/EventTypeDefs.ts

@@ -1,6 +1,6 @@
 import type { Control } from './controls/control.class';
 import type { Point } from './point.class';
-import type { FabricObject } from './shapes/fabricObject.class';
+import type { FabricObject } from './shapes/Object/FabricObject';
 import type { Group } from './shapes/group.class';
 import type { TOriginX, TOriginY, TRadian } from './typedefs';
 import type { saveObjectTransform } from './util/misc/objectTransforms';

src/__types__.ts

@@ -1,7 +1,7 @@
 import { CanvasEvents, ModifierKey, StaticCanvasEvents } from './EventTypeDefs';
 import type { Observable } from './mixins/observable.mixin';
 import type { Point } from './point.class';
-import type { FabricObject } from './shapes/fabricObject.class';
+import type { FabricObject } from './shapes/Object/FabricObject';
 import { TMat2D } from './typedefs';
 
 /**

src/canvas.class.ts

@@ -1,7 +1,7 @@
 //@ts-nocheck
 import { dragHandler, getActionFromCorner } from './controls/actions';
 import { Point } from './point.class';
-import { FabricObject } from './shapes/fabricObject.class';
+import { FabricObject } from './shapes/Object/FabricObject';
 import { Transform } from './EventTypeDefs';
 import { saveObjectTransform } from './util/misc/objectTransforms';
 

src/controls/control.class.ts

@@ -7,7 +7,7 @@ import {
   TransformActionHandler,
 } from '../EventTypeDefs';
 import { Point } from '../point.class';
-import type { FabricObject } from '../shapes/object.class';
+import type { FabricObject } from '../shapes/Object/Object';
 import { TDegree, TMat2D } from '../typedefs';
 import { cos } from '../util/misc/cos';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';

src/controls/controls.render.ts

@@ -1,5 +1,5 @@
 import { PiBy180, twoMathPi } from '../constants';
-import type { FabricObject } from '../shapes/object.class';
+import type { FabricObject } from '../shapes/Object/Object';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
 import type { Control } from './control.class';
 

src/controls/default_controls.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { fabric } from '../../HEADER';
-import { FabricObject } from '../shapes/fabricObject.class';
+import { FabricObject } from '../shapes/Object/FabricObject';
 import {
   changeWidth,
   rotationStyleHandler,

src/controls/scale.ts

@@ -4,7 +4,7 @@ import {
   Transform,
   TransformActionHandler,
 } from '../EventTypeDefs';
-import type { FabricObject } from '../shapes/fabricObject.class';
+import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TAxis } from '../typedefs';
 import { Canvas } from '../__types__';
 import {

src/controls/scaleSkew.ts

@@ -4,7 +4,7 @@ import {
   TPointerEvent,
   TransformActionHandler,
 } from '../EventTypeDefs';
-import type { FabricObject } from '../shapes/object.class';
+import type { FabricObject } from '../shapes/Object/Object';
 import { TAxisKey } from '../typedefs';
 import { Canvas } from '../__types__';
 import { scaleCursorStyleHandler, scalingX, scalingY } from './scale';

src/controls/skew.ts

@@ -4,7 +4,7 @@ import {
   Transform,
   TransformActionHandler,
 } from '../EventTypeDefs';
-import { resolveOrigin } from '../mixins/object_origin.mixin';
+import { resolveOrigin } from '../util/misc/resolveOrigin';
 import { Point } from '../point.class';
 import { TAxis, TAxisKey } from '../typedefs';
 import {

src/controls/util.ts

@@ -4,9 +4,9 @@ import {
   TransformAction,
   BasicTransformEvent,
 } from '../EventTypeDefs';
-import { resolveOrigin } from '../mixins/object_origin.mixin';
+import { resolveOrigin } from '../util/misc/resolveOrigin';
 import { Point } from '../point.class';
-import type { FabricObject } from '../shapes/fabricObject.class';
+import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TOriginX, TOriginY } from '../typedefs';
 import {
   degreesToRadians,

src/gradient/gradient.class.ts

@@ -3,7 +3,7 @@ import { fabric } from '../../HEADER';
 import { Color } from '../color';
 import { iMatrix } from '../constants';
 import { parseTransformAttribute } from '../parser/parseTransformAttribute';
-import type { FabricObject } from '../shapes/fabricObject.class';
+import type { FabricObject } from '../shapes/Object/FabricObject';
 import { TMat2D } from '../typedefs';
 import { uid } from '../util/internals/uid';
 import { pick } from '../util/misc/pick';

src/mixins/canvas_straightening.mixin.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { fabric } from '../../HEADER';
-import type { FabricObject } from '../shapes/fabricObject.class';
+import type { FabricObject } from '../shapes/Object/FabricObject';
 
 fabric.util.object.extend(
   fabric.StaticCanvas.prototype,

src/mixins/collection.mixin.ts

@@ -1,5 +1,5 @@
 import { fabric } from '../../HEADER';
-import type { FabricObject } from '../shapes/fabricObject.class';
+import type { FabricObject } from '../shapes/Object/FabricObject';
 import type { Constructor } from '../typedefs';
 import { removeFromArray } from '../util/internals';
 

src/mixins/itext.svg_export.ts

@@ -2,7 +2,7 @@
 
 import { Color } from '../color';
 import { config } from '../config';
-import { FabricObject } from '../shapes/fabricObject.class';
+import { FabricObject } from '../shapes/Object/FabricObject';
 
 /* _TO_SVG_START_ */
 (function (global) {

src/mixins/text_style.mixin.ts

@@ -1,5 +1,5 @@
 import { ObjectEvents } from '../EventTypeDefs';
-import { FabricObject } from '../shapes/fabricObject.class';
+import { FabricObject } from '../shapes/Object/FabricObject';
 
 export type TextStyleDeclaration = Record<string, any>;
 

src/parser/setStrokeFillOpacity.ts

@@ -2,7 +2,7 @@
 import { Color } from '../color';
 import { toFixed } from '../util/misc/toFixed';
 import { colorAttributes } from './constants';
-import { FabricObject } from '../shapes/fabricObject.class';
+import { FabricObject } from '../shapes/Object/FabricObject';
 
 /**
  * @private

src/shadow.class.ts

@@ -2,7 +2,7 @@ import { fabric } from '../HEADER';
 import { Color } from './color';
 import { config } from './config';
 import { Point } from './point.class';
-import type { FabricObject } from './shapes/fabricObject.class';
+import type { FabricObject } from './shapes/Object/FabricObject';
 import { TClassProperties } from './typedefs';
 import { uid } from './util/internals/uid';
 import { degreesToRadians } from './util/misc/radiansDegreesConversion';

src/mixins/object_animation.mixin.ts → src/shapes/Object/AnimatableObject.ts

@@ -1,10 +1,10 @@
 // @ts-nocheck
-import { noop } from '../constants';
-import { ObjectEvents } from '../EventTypeDefs';
-import { TDegree } from '../typedefs';
-import { animate } from '../util/animate';
-import { animateColor } from '../util/animate_color';
-import { StackedObject } from './object_ancestry.mixin';
+import { noop } from '../../constants';
+import { ObjectEvents } from '../../EventTypeDefs';
+import { TDegree } from '../../typedefs';
+import { animate } from '../../util/animate';
+import { animateColor } from '../../util/animate_color';
+import { StackedObject } from './StackedObject';
 
 /**
  * TODO remove transient

src/shapes/fabricObject.class.ts → src/shapes/Object/FabricObject.ts

@@ -1,8 +1,8 @@
-import { fabric } from '../../HEADER';
-import { ObjectEvents } from '../EventTypeDefs';
-import { FabricObjectSVGExportMixin } from '../mixins/object.svg_export';
-import { InteractiveFabricObject } from '../mixins/object_interactivity.mixin';
-import { applyMixins } from '../util/applyMixins';
+import { fabric } from '../../../HEADER';
+import { ObjectEvents } from '../../EventTypeDefs';
+import { FabricObjectSVGExportMixin } from '../../mixins/object.svg_export';
+import { InteractiveFabricObject } from './InteractiveObject';
+import { applyMixins } from '../../util/applyMixins';
 
 // TODO somehow we have to make a tree-shakeable import
 
@@ -16,6 +16,6 @@ export class FabricObject<
 
 applyMixins(FabricObject, [FabricObjectSVGExportMixin]);
 
-export { fabricObjectDefaultValues } from './object.class';
+export { fabricObjectDefaultValues } from './Object';
 
 fabric.Object = FabricObject;

src/mixins/object_interactivity.mixin.ts → src/shapes/Object/InteractiveObject.ts

@@ -1,17 +1,17 @@
-import { IPoint, Point } from '../point.class';
-import type { TCornerPoint, TDegree, TMat2D } from '../typedefs';
-import { FabricObject } from '../shapes/object.class';
-import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
+import { IPoint, Point } from '../../point.class';
+import type { TCornerPoint, TDegree, TMat2D } from '../../typedefs';
+import { FabricObject } from './Object';
+import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
 import {
   calcRotateMatrix,
   multiplyTransformMatrices,
   qrDecompose,
   TQrDecomposeOut,
-} from '../util/misc/matrix';
-import { ObjectGeometry } from './object_geometry.mixin';
-import type { Control } from '../controls/control.class';
-import { sizeAfterTransform } from '../util/misc/objectTransforms';
-import { ObjectEvents } from '../EventTypeDefs';
+} from '../../util/misc/matrix';
+import { ObjectGeometry } from './ObjectGeometry';
+import type { Control } from '../../controls/control.class';
+import { sizeAfterTransform } from '../../util/misc/objectTransforms';
+import { ObjectEvents } from '../../EventTypeDefs';
 
 type TOCoord = IPoint & {
   corner: TCornerPoint;

src/shapes/object.class.ts → src/shapes/Object/Object.ts

@@ -1,37 +1,37 @@
 // @ts-nocheck
-import { fabric } from '../../HEADER';
-import { cache } from '../cache';
-import { config } from '../config';
-import { ALIASING_LIMIT, iMatrix, VERSION } from '../constants';
-import { ObjectEvents } from '../EventTypeDefs';
-import { AnimatableObject } from '../mixins/object_animation.mixin';
-import { Point } from '../point.class';
-import { Shadow } from '../shadow.class';
+import { fabric } from '../../../HEADER';
+import { cache } from '../../cache';
+import { config } from '../../config';
+import { ALIASING_LIMIT, iMatrix, VERSION } from '../../constants';
+import { ObjectEvents } from '../../EventTypeDefs';
+import { AnimatableObject } from './AnimatableObject';
+import { Point } from '../../point.class';
+import { Shadow } from '../../shadow.class';
 import type {
   TClassProperties,
   TDegree,
   TFiller,
   TSize,
   TCacheCanvasDimensions,
-} from '../typedefs';
-import { runningAnimations } from '../util/animation_registry';
-import { clone } from '../util/lang_object';
-import { capitalize } from '../util/lang_string';
-import { capValue } from '../util/misc/capValue';
-import { createCanvasElement, toDataURL } from '../util/misc/dom';
+} from '../../typedefs';
+import { runningAnimations } from '../../util/animation_registry';
+import { clone } from '../../util/lang_object';
+import { capitalize } from '../../util/lang_string';
+import { capValue } from '../../util/misc/capValue';
+import { createCanvasElement, toDataURL } from '../../util/misc/dom';
 import {
   invertTransform,
   qrDecompose,
   transformPoint,
-} from '../util/misc/matrix';
-import { enlivenObjectEnlivables } from '../util/misc/objectEnlive';
+} from '../../util/misc/matrix';
+import { enlivenObjectEnlivables } from '../../util/misc/objectEnlive';
 import {
   resetObjectTransform,
   saveObjectTransform,
-} from '../util/misc/objectTransforms';
-import { pick } from '../util/misc/pick';
-import { toFixed } from '../util/misc/toFixed';
-import type { Group } from './group.class';
+} from '../../util/misc/objectTransforms';
+import { pick } from '../../util/misc/pick';
+import { toFixed } from '../../util/misc/toFixed';
+import type { Group } from '../group.class';
 
 export type TCachedFabricObject = FabricObject &
   Required<

src/mixins/object_geometry.mixin.ts → src/shapes/Object/ObjectGeometry.ts

@@ -5,25 +5,25 @@ import type {
   TMat2D,
   TOriginX,
   TOriginY,
-} from '../typedefs';
-import { iMatrix } from '../constants';
-import { Intersection } from '../intersection.class';
-import { Point } from '../point.class';
-import { makeBoundingBoxFromPoints } from '../util/misc/boundingBoxFromPoints';
-import { cos } from '../util/misc/cos';
+} from '../../typedefs';
+import { iMatrix } from '../../constants';
+import { Intersection } from '../../intersection.class';
+import { Point } from '../../point.class';
+import { makeBoundingBoxFromPoints } from '../../util/misc/boundingBoxFromPoints';
+import { cos } from '../../util/misc/cos';
 import {
   calcRotateMatrix,
   composeMatrix,
   invertTransform,
   multiplyTransformMatrices,
   qrDecompose,
   transformPoint,
-} from '../util/misc/matrix';
-import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
-import { sin } from '../util/misc/sin';
-import { Canvas, StaticCanvas } from '../__types__';
-import { ObjectOrigin } from './object_origin.mixin';
-import { ObjectEvents } from '../EventTypeDefs';
+} from '../../util/misc/matrix';
+import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
+import { sin } from '../../util/misc/sin';
+import { Canvas, StaticCanvas } from '../../__types__';
+import { ObjectOrigin } from './ObjectOrigin';
+import { ObjectEvents } from '../../EventTypeDefs';
 
 type TLineDescriptor = {
   o: Point;

src/mixins/object_origin.mixin.ts → src/shapes/Object/ObjectOrigin.ts

@@ -1,31 +1,11 @@
-import { Point } from '../point.class';
-import type { Group } from '../shapes/group.class';
-import { TDegree, TOriginX, TOriginY } from '../typedefs';
-import { transformPoint } from '../util/misc/matrix';
-import { sizeAfterTransform } from '../util/misc/objectTransforms';
-import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
-import { CommonMethods } from './shared_methods.mixin';
-
-const originOffset = {
-  left: -0.5,
-  top: -0.5,
-  center: 0,
-  bottom: 0.5,
-  right: 0.5,
-};
-
-/**
- * Resolves origin value relative to center
- * @private
- * @param {TOriginX | TOriginY} originValue originX / originY
- * @returns number
- */
-export const resolveOrigin = (
-  originValue: TOriginX | TOriginY | number
-): number =>
-  typeof originValue === 'string'
-    ? originOffset[originValue]
-    : originValue - 0.5;
+import { Point } from '../../point.class';
+import type { Group } from '../group.class';
+import { TDegree, TOriginX, TOriginY } from '../../typedefs';
+import { transformPoint } from '../../util/misc/matrix';
+import { sizeAfterTransform } from '../../util/misc/objectTransforms';
+import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
+import { CommonMethods } from '../../mixins/shared_methods.mixin';
+import { resolveOrigin } from '../../util/misc/resolveOrigin';
 
 export class ObjectOrigin<EventSpec> extends CommonMethods<EventSpec> {
   /**

src/mixins/object_ancestry.mixin.ts → src/shapes/Object/StackedObject.ts

@@ -1,8 +1,8 @@
-import { fabric } from '../../HEADER';
-import { ObjectEvents } from '../EventTypeDefs';
-import type { Group } from '../shapes/group.class';
-import type { Canvas, StaticCanvas } from '../__types__';
-import { ObjectGeometry } from './object_geometry.mixin';
+import { fabric } from '../../../HEADER';
+import { ObjectEvents } from '../../EventTypeDefs';
+import type { Group } from '../group.class';
+import type { Canvas, StaticCanvas } from '../../__types__';
+import { ObjectGeometry } from './ObjectGeometry';
 
 type TAncestor = StackedObject | Canvas | StaticCanvas;
 type TCollection = Group | Canvas | StaticCanvas;

src/shapes/active_selection.class.ts

@@ -2,7 +2,7 @@ import { fabric } from '../../HEADER';
 import { ControlRenderingStyleOverride } from '../controls';
 import { TClassProperties } from '../typedefs';
 import { enlivenObjects } from '../util/misc/objectEnlive';
-import { FabricObject } from './fabricObject.class';
+import { FabricObject } from './Object/FabricObject';
 import { Group, groupDefaultValues } from './group.class';
 
 export class ActiveSelection extends Group {

src/shapes/circle.class.ts

@@ -5,8 +5,7 @@ import { TClassProperties } from '../typedefs';
 import { cos } from '../util/misc/cos';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
 import { sin } from '../util/misc/sin';
-import { FabricObject } from './fabricObject.class';
-import { fabricObjectDefaultValues } from './object.class';
+import { FabricObject, fabricObjectDefaultValues } from './Object/FabricObject';
 
 export class Circle extends FabricObject {
   /**