feat(fill): add graphicscontextsettings to fill (#132)

* fix: add opacity via args to GraphicsContextSettings * feat: add contextsettings to fill and pass opacity
amzn · Jul 30, 2020 · ff99391 · ff99391
1 parent 4d5b4f6
commit ff99391
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/models/Fill/Fill.js b/models/Fill/Fill.js
@@ -13,6 +13,7 @@
 
 const Color = require('../Color');
 const Gradient = require('../Gradient');
+const GraphicsContextSettings = require('../GraphicsContextSettings');
 
 /**
  *
@@ -26,6 +27,7 @@ class Fill {
    * @property {integer} noiseIntensity
    * @property {integer} patternFillType
    * @property {integer} patternTileScale
+   * @property {GraphicsContextSettings.Model} contextSettings
    */
   static get Model() {
     return {
@@ -38,13 +40,15 @@ class Fill {
       patternFillType: 0,
       patternTileScale: 1,
       gradient: Gradient.Model,
+      contextSettings: GraphicsContextSettings.Model,
     };
   }
 
   /**
    *
    * @param {Object} args
    * @param {String|Object} args.color Passed to {@link Color} constructor
+   * @param {float|Object} args.opacity Passed to {@link GraphicsContextSettings} constructor
    * @param {Fill.Model} json
    */
   constructor(args = {}, json) {
@@ -69,6 +73,7 @@ class Fill {
         patternFillType: args.patternFillType || 0,
         patternTileScale: args.patternTileScale || 1,
         gradient: args.gradient ? new Gradient(args.gradient) : undefined,
+        contextSettings: new GraphicsContextSettings({ opacity: args.opacity }),
       });
     }
     return this;

diff --git a/models/Fill/index.d.ts b/models/Fill/index.d.ts
@@ -1,5 +1,6 @@
 import Color from '../Color';
 import Gradient from '../Gradient';
+import GraphicsContextSettings from '../GraphicsContextSettings';
 
 declare const enum FillType {
   Color = 0,
@@ -20,6 +21,7 @@ declare class Fill {
   patternFillType: number;
   patternTileScale: number;
   gradient: Gradient;
+  contextSettings: GraphicsContextSettings;
 
   constructor(args?: any, json?: any);
 }

diff --git a/models/GraphicsContextSettings/GraphicsContextSettings.js b/models/GraphicsContextSettings/GraphicsContextSettings.js
@@ -40,6 +40,7 @@ class GraphicsContextSettings {
     } else {
       Object.assign(this, GraphicsContextSettings.Model, args, {
         blendMode: blendModeMap[args.blendMode || 'normal'],
+        opacity: args.opacity || 1,
       });
     }
     return this;