expo-print 11.0.1 → 11.1.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 11.1.0 — 2021-12-03
+
+### 🐛 Bug fixes
+
+- Fix page-breaks and margins not supported on iOS ([#14383](https://github.com/expo/expo/pull/14802) by [@cruzach](https://github.com/IjzerenHein))
+
 ## 11.0.1 — 2021-10-01
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '11.0.1'
+version = '11.1.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -57,7 +57,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 27
-    versionName "11.0.1"
+    versionName "11.1.0"
   }
   lintOptions {
     abortOnError false

package/build/Print.d.ts

@@ -14,8 +14,9 @@ export declare const Orientation: OrientationType;
  */
 export declare function printAsync(options: PrintOptions): Promise<void>;
 /**
- * **Available on iOS only.** Chooses a printer that can be later used in `printAsync`
+ * Chooses a printer that can be later used in `printAsync`
  * @return A promise which fulfils with an object containing `name` and `url` of the selected printer.
+ * @platform ios
  */
 export declare function selectPrinterAsync(): Promise<Printer>;
 /**

package/build/Print.js

@@ -32,8 +32,9 @@ export async function printAsync(options) {
 }
 // @needsAudit
 /**
- * **Available on iOS only.** Chooses a printer that can be later used in `printAsync`
+ * Chooses a printer that can be later used in `printAsync`
  * @return A promise which fulfils with an object containing `name` and `url` of the selected printer.
+ * @platform ios
  */
 export async function selectPrinterAsync() {
     if (ExponentPrint.selectPrinter) {

package/build/Print.js.map

@@ -1 +1 @@
-{"version":3,"file":"Print.js","sourceRoot":"","sources":["../src/Print.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAW5C,2BAA2B;AAC3B;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAoB,aAAa,CAAC,WAAW,CAAC;AAEtE,cAAc;AACd;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAqB;IACpD,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;QACzB,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAC3C;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;QACzF,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IACD,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;KACzF;IACD,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;KAC9F;IACD,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,cAAc;AACd;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,IAAI,aAAa,CAAC,aAAa,EAAE;QAC/B,OAAO,MAAM,aAAa,CAAC,aAAa,EAAE,CAAC;KAC5C;IAED,MAAM,IAAI,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;AAC/D,CAAC;AAED,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAA4B,EAAE;IACnE,OAAO,MAAM,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACvD,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\nimport { Platform } from 'react-native';\n\nimport ExponentPrint from './ExponentPrint';\nimport {\n  FilePrintOptions,\n  FilePrintResult,\n  OrientationType,\n  PrintOptions,\n  Printer,\n} from './Print.types';\n\nexport { FilePrintOptions, FilePrintResult, OrientationType, PrintOptions, Printer };\n\n// @needsAudit @docsMissing\n/**\n * The orientation of the printed content.\n */\nexport const Orientation: OrientationType = ExponentPrint.Orientation;\n\n// @needsAudit\n/**\n * Prints a document or HTML, on web this prints the HTML from the page.\n * > Note: On iOS, printing from HTML source doesn't support local asset URLs (due to `WKWebView`\n * > limitations). As a workaround you can use inlined base64-encoded strings.\n * > See [this comment](https://github.com/expo/expo/issues/7940#issuecomment-657111033) for more details.\n * @param options A map defining what should be printed.\n * @return Resolves to an empty `Promise` if printing started.\n */\nexport async function printAsync(options: PrintOptions): Promise<void> {\n  if (Platform.OS === 'web') {\n    return await ExponentPrint.print(options);\n  }\n  if (!options.uri && !options.html && Platform.OS === 'ios' && !options.markupFormatterIOS) {\n    throw new Error('Must provide either `html` or `uri` to print');\n  }\n  if (options.uri && options.html) {\n    throw new Error('Must provide exactly one of `html` and `uri` but both were specified');\n  }\n  if (options.markupFormatterIOS !== undefined) {\n    console.warn('The markupFormatterIOS option is deprecated. Use useMarkupFormatter instead.');\n  }\n  return await ExponentPrint.print(options);\n}\n\n// @needsAudit\n/**\n * **Available on iOS only.** Chooses a printer that can be later used in `printAsync`\n * @return A promise which fulfils with an object containing `name` and `url` of the selected printer.\n */\nexport async function selectPrinterAsync(): Promise<Printer> {\n  if (ExponentPrint.selectPrinter) {\n    return await ExponentPrint.selectPrinter();\n  }\n\n  throw new UnavailabilityError('Print', 'selectPrinterAsync');\n}\n\n// @needsAudit\n/**\n * Prints HTML to PDF file and saves it to [app's cache directory](./filesystem/#filesystemcachedirectory).\n * On Web this method opens the print dialog.\n * @param options A map of print options.\n */\nexport async function printToFileAsync(options: FilePrintOptions = {}): Promise<FilePrintResult> {\n  return await ExponentPrint.printToFileAsync(options);\n}\n"]}
+{"version":3,"file":"Print.js","sourceRoot":"","sources":["../src/Print.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAW5C,2BAA2B;AAC3B;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAoB,aAAa,CAAC,WAAW,CAAC;AAEtE,cAAc;AACd;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAqB;IACpD,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;QACzB,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAC3C;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;QACzF,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IACD,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;KACzF;IACD,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;KAC9F;IACD,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,IAAI,aAAa,CAAC,aAAa,EAAE;QAC/B,OAAO,MAAM,aAAa,CAAC,aAAa,EAAE,CAAC;KAC5C;IAED,MAAM,IAAI,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;AAC/D,CAAC;AAED,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAA4B,EAAE;IACnE,OAAO,MAAM,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACvD,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\nimport { Platform } from 'react-native';\n\nimport ExponentPrint from './ExponentPrint';\nimport {\n  FilePrintOptions,\n  FilePrintResult,\n  OrientationType,\n  PrintOptions,\n  Printer,\n} from './Print.types';\n\nexport { FilePrintOptions, FilePrintResult, OrientationType, PrintOptions, Printer };\n\n// @needsAudit @docsMissing\n/**\n * The orientation of the printed content.\n */\nexport const Orientation: OrientationType = ExponentPrint.Orientation;\n\n// @needsAudit\n/**\n * Prints a document or HTML, on web this prints the HTML from the page.\n * > Note: On iOS, printing from HTML source doesn't support local asset URLs (due to `WKWebView`\n * > limitations). As a workaround you can use inlined base64-encoded strings.\n * > See [this comment](https://github.com/expo/expo/issues/7940#issuecomment-657111033) for more details.\n * @param options A map defining what should be printed.\n * @return Resolves to an empty `Promise` if printing started.\n */\nexport async function printAsync(options: PrintOptions): Promise<void> {\n  if (Platform.OS === 'web') {\n    return await ExponentPrint.print(options);\n  }\n  if (!options.uri && !options.html && Platform.OS === 'ios' && !options.markupFormatterIOS) {\n    throw new Error('Must provide either `html` or `uri` to print');\n  }\n  if (options.uri && options.html) {\n    throw new Error('Must provide exactly one of `html` and `uri` but both were specified');\n  }\n  if (options.markupFormatterIOS !== undefined) {\n    console.warn('The markupFormatterIOS option is deprecated. Use useMarkupFormatter instead.');\n  }\n  return await ExponentPrint.print(options);\n}\n\n// @needsAudit\n/**\n * Chooses a printer that can be later used in `printAsync`\n * @return A promise which fulfils with an object containing `name` and `url` of the selected printer.\n * @platform ios\n */\nexport async function selectPrinterAsync(): Promise<Printer> {\n  if (ExponentPrint.selectPrinter) {\n    return await ExponentPrint.selectPrinter();\n  }\n\n  throw new UnavailabilityError('Print', 'selectPrinterAsync');\n}\n\n// @needsAudit\n/**\n * Prints HTML to PDF file and saves it to [app's cache directory](./filesystem/#filesystemcachedirectory).\n * On Web this method opens the print dialog.\n * @param options A map of print options.\n */\nexport async function printToFileAsync(options: FilePrintOptions = {}): Promise<FilePrintResult> {\n  return await ExponentPrint.printToFileAsync(options);\n}\n"]}

package/build/Print.types.d.ts

@@ -2,11 +2,14 @@ export declare type PrintOptions = {
     /**
      * URI of a PDF file to print. Remote, local (ex. selected via `DocumentPicker`) or base64 data URI
      * starting with `data:application/pdf;base64,`. This only supports PDF, not other types of
-     * document (e.g. images). **Available on Android and iOS only.**
+     * document (e.g. images).
+     * @platform ios
      */
     uri?: string;
     /**
-     * HTML string to print. **Available on Android and iOS only.**
+     * HTML string to print.
+     * @platform android
+     * @platform ios
      */
     html?: string;
     /**
@@ -20,25 +23,34 @@ export declare type PrintOptions = {
      */
     height?: number;
     /**
-     * URL of the printer to use. Returned from `selectPrinterAsync`. **Available on iOS only.**
+     * URL of the printer to use. Returned from `selectPrinterAsync`.
+     * @platform ios
      */
     printerUrl?: string;
     /**
-     * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
+     * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
      * instead of WebView, but it doesn't display images.
+     * @platform ios
      */
     useMarkupFormatter?: boolean;
     /**
      * @deprecated
-     * **Available on iOS only.** This argument is deprecated, use `useMarkupFormatter` instead.
+     * This argument is deprecated, use `useMarkupFormatter` instead.
      * Might be removed in the future releases.
+     * @platform ios
      */
     markupFormatterIOS?: string;
     /**
-     * **Available on iOS only.** The orientation of the printed content, `Print.Orientation.portrait`
+     * The orientation of the printed content, `Print.Orientation.portrait`
      * or `Print.Orientation.landscape`.
+     * @platform ios
      */
     orientation?: OrientationType['portrait'] | OrientationType['landscape'];
+    /**
+     * Page margins for the printed document.
+     * @platform ios
+     */
+    margins?: PageMargins;
 };
 export declare type Printer = {
     /**
@@ -57,14 +69,21 @@ export interface OrientationType {
     portrait: string;
     landscape: string;
 }
+export declare type PageMargins = {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+};
 export declare type FilePrintOptions = {
     /**
      * HTML string to print into PDF file.
      */
     html?: string;
     /**
-     * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
+     * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
      * instead of WebView, but it doesn't display images.
+     * @platform ios
      */
     useMarkupFormatter?: boolean;
     /**
@@ -78,20 +97,15 @@ export declare type FilePrintOptions = {
      */
     height?: number;
     /**
-     * Padding for the printed document.
+     * Page margins for the printed document.
+     * @platform ios
      */
-    padding?: FilePrintPadding;
+    margins?: PageMargins;
     /**
      * Whether to include base64 encoded string of the file in the returned object.
      */
     base64?: boolean;
 };
-export declare type FilePrintPadding = {
-    top: number;
-    right: number;
-    bottom: number;
-    left: number;
-};
 export declare type FilePrintResult = {
     /**
      * A URI to the printed PDF file.

package/build/Print.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Print.types.js","sourceRoot":"","sources":["../src/Print.types.ts"],"names":[],"mappings":"","sourcesContent":["// @needsAudit\nexport type PrintOptions = {\n  /**\n   * URI of a PDF file to print. Remote, local (ex. selected via `DocumentPicker`) or base64 data URI\n   * starting with `data:application/pdf;base64,`. This only supports PDF, not other types of\n   * document (e.g. images). **Available on Android and iOS only.**\n   */\n  uri?: string;\n  /**\n   * HTML string to print. **Available on Android and iOS only.**\n   */\n  html?: string;\n  /**\n   * Width of the single page in pixels. Defaults to `612` which is a width of US Letter paper\n   * format with 72 PPI. **Available only with `html` option.**\n   */\n  width?: number;\n  /**\n   * Height of the single page in pixels. Defaults to `792` which is a height of US Letter paper\n   * format with 72 PPI. **Available only with `html` option.**\n   */\n  height?: number;\n  /**\n   * URL of the printer to use. Returned from `selectPrinterAsync`. **Available on iOS only.**\n   */\n  printerUrl?: string;\n  /**\n   * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)\n   * instead of WebView, but it doesn't display images.\n   */\n  useMarkupFormatter?: boolean;\n  /**\n   * @deprecated\n   * **Available on iOS only.** This argument is deprecated, use `useMarkupFormatter` instead.\n   * Might be removed in the future releases.\n   */\n  markupFormatterIOS?: string;\n  /**\n   * **Available on iOS only.** The orientation of the printed content, `Print.Orientation.portrait`\n   * or `Print.Orientation.landscape`.\n   */\n  orientation?: OrientationType['portrait'] | OrientationType['landscape'];\n};\n\n// @needsAudit\nexport type Printer = {\n  /**\n   * Name of the printer.\n   */\n  name: string;\n  /**\n   * URL of the printer.\n   */\n  url: string;\n};\n\n// @needsAudit\n/**\n * The possible values of orientation for the printed content.\n */\nexport interface OrientationType {\n  portrait: string;\n  landscape: string;\n}\n\n// @docsMissing\nexport type FilePrintOptions = {\n  /**\n   * HTML string to print into PDF file.\n   */\n  html?: string;\n  /**\n   * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)\n   * instead of WebView, but it doesn't display images.\n   */\n  useMarkupFormatter?: boolean;\n  /**\n   * Width of the single page in pixels. Defaults to `612` which is a width of US Letter paper\n   * format with 72 PPI.\n   */\n  width?: number;\n  /**\n   * Height of the single page in pixels. Defaults to `792` which is a height of US Letter paper\n   * format with 72 PPI.\n   */\n  height?: number;\n  /**\n   * Padding for the printed document.\n   */\n  padding?: FilePrintPadding;\n  /**\n   * Whether to include base64 encoded string of the file in the returned object.\n   */\n  base64?: boolean;\n};\n\n// @needsAudit\nexport type FilePrintPadding = {\n  top: number;\n  right: number;\n  bottom: number;\n  left: number;\n};\n\n// @needsAudit\nexport type FilePrintResult = {\n  /**\n   * A URI to the printed PDF file.\n   */\n  uri: string;\n  /**\n   * Number of pages that were needed to render given content.\n   */\n  numberOfPages: number;\n  /**\n   * Base64 encoded string containing the data of the PDF file. **Available only if `base64`\n   * option is truthy**. It doesn't include data URI prefix `data:application/pdf;base64,`.\n   */\n  base64?: string;\n};\n"]}
+{"version":3,"file":"Print.types.js","sourceRoot":"","sources":["../src/Print.types.ts"],"names":[],"mappings":"","sourcesContent":["// @needsAudit\nexport type PrintOptions = {\n  /**\n   * URI of a PDF file to print. Remote, local (ex. selected via `DocumentPicker`) or base64 data URI\n   * starting with `data:application/pdf;base64,`. This only supports PDF, not other types of\n   * document (e.g. images).\n   * @platform ios\n   */\n  uri?: string;\n  /**\n   * HTML string to print.\n   * @platform android\n   * @platform ios\n   */\n  html?: string;\n  /**\n   * Width of the single page in pixels. Defaults to `612` which is a width of US Letter paper\n   * format with 72 PPI. **Available only with `html` option.**\n   */\n  width?: number;\n  /**\n   * Height of the single page in pixels. Defaults to `792` which is a height of US Letter paper\n   * format with 72 PPI. **Available only with `html` option.**\n   */\n  height?: number;\n  /**\n   * URL of the printer to use. Returned from `selectPrinterAsync`.\n   * @platform ios\n   */\n  printerUrl?: string;\n  /**\n   * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)\n   * instead of WebView, but it doesn't display images.\n   * @platform ios\n   */\n  useMarkupFormatter?: boolean;\n  /**\n   * @deprecated\n   * This argument is deprecated, use `useMarkupFormatter` instead.\n   * Might be removed in the future releases.\n   * @platform ios\n   */\n  markupFormatterIOS?: string;\n  /**\n   * The orientation of the printed content, `Print.Orientation.portrait`\n   * or `Print.Orientation.landscape`.\n   * @platform ios\n   */\n  orientation?: OrientationType['portrait'] | OrientationType['landscape'];\n  /**\n   * Page margins for the printed document.\n   * @platform ios\n   */\n  margins?: PageMargins;\n};\n\n// @needsAudit\nexport type Printer = {\n  /**\n   * Name of the printer.\n   */\n  name: string;\n  /**\n   * URL of the printer.\n   */\n  url: string;\n};\n\n// @needsAudit\n/**\n * The possible values of orientation for the printed content.\n */\nexport interface OrientationType {\n  portrait: string;\n  landscape: string;\n}\n\n// @needsAudit\nexport type PageMargins = {\n  top: number;\n  right: number;\n  bottom: number;\n  left: number;\n};\n\n// @docsMissing\nexport type FilePrintOptions = {\n  /**\n   * HTML string to print into PDF file.\n   */\n  html?: string;\n  /**\n   * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)\n   * instead of WebView, but it doesn't display images.\n   * @platform ios\n   */\n  useMarkupFormatter?: boolean;\n  /**\n   * Width of the single page in pixels. Defaults to `612` which is a width of US Letter paper\n   * format with 72 PPI.\n   */\n  width?: number;\n  /**\n   * Height of the single page in pixels. Defaults to `792` which is a height of US Letter paper\n   * format with 72 PPI.\n   */\n  height?: number;\n  /**\n   * Page margins for the printed document.\n   * @platform ios\n   */\n  margins?: PageMargins;\n  /**\n   * Whether to include base64 encoded string of the file in the returned object.\n   */\n  base64?: boolean;\n};\n\n// @needsAudit\nexport type FilePrintResult = {\n  /**\n   * A URI to the printed PDF file.\n   */\n  uri: string;\n  /**\n   * Number of pages that were needed to render given content.\n   */\n  numberOfPages: number;\n  /**\n   * Base64 encoded string containing the data of the PDF file. **Available only if `base64`\n   * option is truthy**. It doesn't include data URI prefix `data:application/pdf;base64,`.\n   */\n  base64?: string;\n};\n"]}

package/ios/EXPrint/EXPrint.m

@@ -178,6 +178,7 @@ EX_EXPORT_METHOD_AS(printToFileAsync,
   __block EXWKPDFRenderer *renderTask;
   NSString *htmlString = options[@"html"] ?: @"";
   CGSize paperSize = [self _paperSizeFromOptions:options];
+  UIEdgeInsets pageMargins = [self _pageMarginsFromOptions:options];
     
   void (^completionHandler)(NSError * _Nullable, NSData * _Nullable, int) =
     ^(NSError * _Nullable error, NSData * _Nullable pdfData, int pagesCount) {
@@ -221,7 +222,7 @@ EX_EXPORT_METHOD_AS(printToFileAsync,
     [self pdfWithHtmlMarkupFormatter:htmlString pageSize:paperSize completionHandler:completionHandler];
   } else {
     renderTask = [EXWKPDFRenderer new];
-    [renderTask PDFWithHtml:htmlString pageSize:paperSize completionHandler:completionHandler];
+    [renderTask PDFWithHtml:htmlString pageSize:paperSize pageMargins:pageMargins completionHandler:completionHandler];
   }
 }
 
@@ -307,7 +308,8 @@ EX_EXPORT_METHOD_AS(printToFileAsync,
 
     NSString *htmlString = options[@"html"] ?: @"";
     CGSize paperSize = [self _paperSizeFromOptions:options];
-    [renderTask PDFWithHtml:htmlString pageSize:paperSize completionHandler:^(NSError * _Nullable error, NSData * _Nullable pdfData, int pagesCount) {
+    UIEdgeInsets pageMargins = [self _pageMarginsFromOptions:options];
+    [renderTask PDFWithHtml:htmlString pageSize:paperSize pageMargins:pageMargins completionHandler:^(NSError * _Nullable error, NSData * _Nullable pdfData, int pagesCount) {
       if (pdfData != nil) {
         callback(pdfData, nil);
       } else {
@@ -357,6 +359,21 @@ EX_EXPORT_METHOD_AS(printToFileAsync,
   return paperSize;
 }
 
+- (UIEdgeInsets)_pageMarginsFromOptions:(NSDictionary *)options
+{
+  UIEdgeInsets pageMargins = UIEdgeInsetsZero;
+
+  if (options[@"margins"]) {
+    NSDictionary* margins = options[@"margins"];
+    pageMargins.left = [margins[@"left"] floatValue];
+    pageMargins.top = [margins[@"top"] floatValue];
+    pageMargins.bottom = [margins[@"bottom"] floatValue];
+    pageMargins.right = [margins[@"right"] floatValue];
+  }
+
+  return pageMargins;
+}
+
 - (NSString *)_generatePath
 {
   id<EXFileSystemInterface> fileSystem = [_moduleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];

package/ios/EXPrint/EXWKPDFRenderer.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface EXWKPDFRenderer : NSObject
 
-- (void)PDFWithHtml:(NSString *)htmlString pageSize:(CGSize)pageSize completionHandler:(void(^_Nullable)(NSError * _Nullable, NSData * _Nullable, int))handler;
+- (void)PDFWithHtml:(NSString *)htmlString pageSize:(CGSize)pageSize pageMargins:(UIEdgeInsets)pageMargins completionHandler:(void(^_Nullable)(NSError * _Nullable, NSData * _Nullable, int))handler;
 
 @end
 

package/ios/EXPrint/EXWKPDFRenderer.m

@@ -2,11 +2,12 @@
 
 #import <EXPrint/EXWKPDFRenderer.h>
 #import <ExpoModulesCore/EXDefines.h>
-#import <EXPrint/EXWKSnapshotPDFRenderer.h>
+#import <EXPrint/EXWKViewPrintPDFRenderer.h>
 
 @interface EXWKPDFRenderer () <WKNavigationDelegate>
 
 @property (nonatomic, assign) CGSize pageSize;
+@property (nonatomic, assign) UIEdgeInsets pageMargins;
 @property (nonatomic, strong) WKWebView *webView;
 @property (nonatomic, strong) id<EXPDFRenderer> renderer;
 @property (nonatomic, strong) WKNavigation *htmlNavigation;
@@ -16,13 +17,14 @@
 
 @implementation EXWKPDFRenderer
 
-- (void)PDFWithHtml:(NSString *)htmlString pageSize:(CGSize)pageSize completionHandler:(void (^)(NSError * _Nullable, NSData * _Nullable, int))handler
+- (void)PDFWithHtml:(NSString *)htmlString pageSize:(CGSize)pageSize pageMargins:(UIEdgeInsets)pageMargins completionHandler:(void (^)(NSError * _Nullable, NSData * _Nullable, int))handler
 {
   _pageSize = pageSize;
+  _pageMargins = pageMargins;
   _onRenderingFinished = handler;
   _webView = [self createWebView];
-  _renderer = [[EXWKSnapshotPDFRenderer alloc] init];
-  _htmlNavigation = [_webView loadHTMLString:htmlString baseURL:nil];
+  _renderer = [[EXWKViewPrintPDFRenderer alloc] initWithPageSize:pageSize pageMargins:pageMargins];
+  _htmlNavigation = [_webView loadHTMLString:htmlString baseURL:[[NSBundle mainBundle] resourceURL]];
 }
 
 #pragma mark - UIWebViewDelegate

package/ios/EXPrint/{EXWKSnapshotPDFRenderer.h → EXWKViewPrintPDFRenderer.h}

@@ -1,4 +1,4 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
+// Copyright 2021-present 650 Industries. All rights reserved.
 
 #import <Foundation/Foundation.h>
 #import <WebKit/WebKit.h>
@@ -6,9 +6,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface EXWKSnapshotPDFRenderer : NSObject <EXPDFRenderer>
+@interface EXWKViewPrintPDFRenderer : NSObject <EXPDFRenderer>
 
-- (void)PDFFromWebView:(WKWebView *)webView completionHandler:(void(^_Nullable)(NSError * _Nullable, NSData * _Nullable, int))handler;
+- (instancetype)initWithPageSize:(CGSize)pageSize pageMargins:(UIEdgeInsets)pageMargins;
+
+- (void)PDFFromWebView:(WKWebView *)webView completionHandler:(void(^_Nullable)(NSError * _Nullable, NSData * _Nullable, int))handler API_AVAILABLE(ios(8.0));
 
 @end
 

package/ios/EXPrint/EXWKViewPrintPDFRenderer.m

@@ -0,0 +1,51 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+#import <EXPrint/EXWKViewPrintPDFRenderer.h>
+#import <ExpoModulesCore/EXDefines.h>
+
+@interface EXWKViewPrintPDFRenderer ()
+
+@property (nonatomic, assign) CGSize pageSize;
+@property (nonatomic, assign) UIEdgeInsets pageMargins;
+
+@end
+
+@implementation EXWKViewPrintPDFRenderer
+
+- (instancetype)initWithPageSize:(CGSize)pageSize pageMargins:(UIEdgeInsets)pageMargins
+{
+  if (self = [super init]) {
+    _pageSize = pageSize;
+    _pageMargins = pageMargins;
+  }
+  return self;
+}
+
+- (void)PDFFromWebView:(WKWebView *)webView completionHandler:(void (^)(NSError * _Nullable, NSData * _Nullable, int))handler
+{
+  EX_WEAKIFY(self);
+  [webView evaluateJavaScript:@"document.body.scrollHeight;" completionHandler:^(id jsValue, NSError * _Nullable error) {
+    EX_ENSURE_STRONGIFY(self);
+
+    UIPrintPageRenderer *renderer = [[UIPrintPageRenderer alloc] init];
+    [renderer addPrintFormatter:webView.viewPrintFormatter startingAtPageAtIndex:0];
+
+    CGRect paperRect = CGRectMake(0, 0, self.pageSize.width, self.pageSize.height);
+    [renderer setValue:[NSValue valueWithCGRect:paperRect] forKey:@"paperRect"];
+    CGRect printableRect = CGRectMake(self.pageMargins.left, self.pageMargins.top, paperRect.size.width - self.pageMargins.left - self.pageMargins.right, paperRect.size.height - self.pageMargins.top - self.pageMargins.bottom);
+    [renderer setValue:[NSValue valueWithCGRect:printableRect] forKey:@"printableRect"];
+
+    NSMutableData* data = [[NSMutableData alloc] init];
+    UIGraphicsBeginPDFContextToData(data, CGRectZero /* paperRect */, nil);
+    [renderer prepareForDrawingPages: NSMakeRange(0, renderer.numberOfPages)];
+    for (int i = 0; i < renderer.numberOfPages; i++) {
+      UIGraphicsBeginPDFPage();
+      [renderer drawPageAtIndex:i inRect: UIGraphicsGetPDFContextBounds()];
+    }
+    UIGraphicsEndPDFContext();
+
+    handler(nil, data, (int)renderer.numberOfPages);
+  }];
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-print",
-  "version": "11.0.1",
+  "version": "11.1.0",
   "description": "Provides an API for iOS (AirPrint) and Android printing functionality.",
   "main": "build/Print.js",
   "types": "build/Print.d.ts",
@@ -31,13 +31,14 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/print/",
   "jest": {
-    "preset": "expo-module-scripts/ios"
-  },
-  "dependencies": {
-    "expo-modules-core": "~0.4.2"
+    "preset": "expo-module-scripts"
   },
+  "dependencies": {},
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "2718b696f4a6919905b0f47ebb24ff65b42d8ff9"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
 }

package/src/Print.ts

@@ -45,8 +45,9 @@ export async function printAsync(options: PrintOptions): Promise<void> {
 
 // @needsAudit
 /**
- * **Available on iOS only.** Chooses a printer that can be later used in `printAsync`
+ * Chooses a printer that can be later used in `printAsync`
  * @return A promise which fulfils with an object containing `name` and `url` of the selected printer.
+ * @platform ios
  */
 export async function selectPrinterAsync(): Promise<Printer> {
   if (ExponentPrint.selectPrinter) {

package/src/Print.types.ts

@@ -3,11 +3,14 @@ export type PrintOptions = {
   /**
    * URI of a PDF file to print. Remote, local (ex. selected via `DocumentPicker`) or base64 data URI
    * starting with `data:application/pdf;base64,`. This only supports PDF, not other types of
-   * document (e.g. images). **Available on Android and iOS only.**
+   * document (e.g. images).
+   * @platform ios
    */
   uri?: string;
   /**
-   * HTML string to print. **Available on Android and iOS only.**
+   * HTML string to print.
+   * @platform android
+   * @platform ios
    */
   html?: string;
   /**
@@ -21,25 +24,34 @@ export type PrintOptions = {
    */
   height?: number;
   /**
-   * URL of the printer to use. Returned from `selectPrinterAsync`. **Available on iOS only.**
+   * URL of the printer to use. Returned from `selectPrinterAsync`.
+   * @platform ios
    */
   printerUrl?: string;
   /**
-   * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
+   * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
    * instead of WebView, but it doesn't display images.
+   * @platform ios
    */
   useMarkupFormatter?: boolean;
   /**
    * @deprecated
-   * **Available on iOS only.** This argument is deprecated, use `useMarkupFormatter` instead.
+   * This argument is deprecated, use `useMarkupFormatter` instead.
    * Might be removed in the future releases.
+   * @platform ios
    */
   markupFormatterIOS?: string;
   /**
-   * **Available on iOS only.** The orientation of the printed content, `Print.Orientation.portrait`
+   * The orientation of the printed content, `Print.Orientation.portrait`
    * or `Print.Orientation.landscape`.
+   * @platform ios
    */
   orientation?: OrientationType['portrait'] | OrientationType['landscape'];
+  /**
+   * Page margins for the printed document.
+   * @platform ios
+   */
+  margins?: PageMargins;
 };
 
 // @needsAudit
@@ -63,6 +75,14 @@ export interface OrientationType {
   landscape: string;
 }
 
+// @needsAudit
+export type PageMargins = {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+};
+
 // @docsMissing
 export type FilePrintOptions = {
   /**
@@ -70,8 +90,9 @@ export type FilePrintOptions = {
    */
   html?: string;
   /**
-   * **Available on iOS only.** Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
+   * Alternative to default option that uses [UIMarkupTextPrintFormatter](https://developer.apple.com/documentation/uikit/uimarkuptextprintformatter)
    * instead of WebView, but it doesn't display images.
+   * @platform ios
    */
   useMarkupFormatter?: boolean;
   /**
@@ -85,23 +106,16 @@ export type FilePrintOptions = {
    */
   height?: number;
   /**
-   * Padding for the printed document.
+   * Page margins for the printed document.
+   * @platform ios
    */
-  padding?: FilePrintPadding;
+  margins?: PageMargins;
   /**
    * Whether to include base64 encoded string of the file in the returned object.
    */
   base64?: boolean;
 };
 
-// @needsAudit
-export type FilePrintPadding = {
-  top: number;
-  right: number;
-  bottom: number;
-  left: number;
-};
-
 // @needsAudit
 export type FilePrintResult = {
   /**

package/ios/EXPrint/EXWKSnapshotPDFRenderer.m

@@ -1,61 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-#import <EXPrint/EXWKSnapshotPDFRenderer.h>
-#import <ExpoModulesCore/EXDefines.h>
-
-@interface EXWKSnapshotPDFRenderer ()
-
-@end
-
-@implementation EXWKSnapshotPDFRenderer
-
-- (void)PDFFromWebView:(WKWebView *)webView completionHandler:(void (^)(NSError * _Nullable, NSData * _Nullable, int))handler
-{
-  EX_WEAKIFY(self);
-  [webView evaluateJavaScript:@"window.innerHeight + ' ' + document.documentElement.scrollHeight" completionHandler:^(id jsResult, NSError * _Nullable error) {
-    EX_ENSURE_STRONGIFY(self);
-    NSString *jsResultString = jsResult;
-    NSArray *items = [jsResultString componentsSeparatedByString:@" "];
-    CGFloat pageHeight = [items[0] doubleValue];
-    CGFloat scrollHeight = [items[1] doubleValue];
-    int numberOfPages = ceil(scrollHeight / pageHeight);
-
-    // Ensure all content is loaded by scrolling to the end of webpage
-    [webView.scrollView setContentOffset:CGPointMake(0, scrollHeight - pageHeight) animated:NO];
-
-    NSMutableData *pdfData = [NSMutableData data];
-    UIGraphicsBeginPDFContextToData(pdfData, webView.bounds, nil);
-    [self takeSnapshotForPage:0 ofPages:numberOfPages ofWebView:webView withCompletionHandler:^(NSError * _Nullable error) {
-      UIGraphicsEndPDFContext();
-      if (error) {
-        handler(error, nil, 0);
-      } else {
-        handler(nil, pdfData, numberOfPages);
-      }
-    }];
-  }];
-}
-
-- (void)takeSnapshotForPage:(int)pageIndex ofPages:(int)pagesCount ofWebView:(WKWebView *)webView withCompletionHandler:(void (^ _Nullable)(NSError * _Nullable error))completionHandler
-{
-  if (pageIndex >= pagesCount) {
-    completionHandler(nil);
-    return;
-  }
-
-  CGFloat pageHeight = webView.bounds.size.height;
-
-  [webView.scrollView setContentOffset:CGPointMake(0, pageHeight * pageIndex) animated:NO];
-  [webView takeSnapshotWithConfiguration:nil completionHandler:^(UIImage * _Nullable snapshotImage, NSError * _Nullable error) {
-    if (snapshotImage) {
-      CGRect printRect = UIGraphicsGetPDFContextBounds();
-      UIGraphicsBeginPDFPage();
-      [snapshotImage drawInRect:printRect];
-      [self takeSnapshotForPage:(pageIndex + 1) ofPages:pagesCount ofWebView:webView withCompletionHandler:completionHandler];
-    } else {
-      completionHandler(error);
-    }
-  }];
-}
-
-@end