@sitecore-jss/sitecore-jss-react 16.0.0-canary.8 → 16.0.1

package/LICENSE.txt

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,6 +1,6 @@
-# Sitecore JavaScript Services for React
-
-This module is provided as a part of Sitecore JavaScript Services. It contains React components and integration for JSS.
-
-Consult the [Sitecore JSS documentation](https://jss.sitecore.net) for further details.
-
+# Sitecore JavaScript Services for React
+
+This module is provided as a part of Sitecore JavaScript Services. It contains React components and integration for JSS.
+
+Consult the [Sitecore JSS documentation](https://jss.sitecore.net) for further details.
+

package/dist/components/File.js

@@ -37,7 +37,9 @@ exports.File = function (_a) {
         return null;
     }
     // handle link directly on field for forgetful devs
-    var file = dynamicField.src ? field : dynamicField.value;
+    var file = (dynamicField.src
+        ? field
+        : dynamicField.value);
     if (!file) {
         return null;
     }
@@ -56,5 +58,6 @@ exports.File.propTypes = {
             value: prop_types_1.default.object,
         }),
     ]).isRequired,
+    children: prop_types_1.default.node,
 };
 exports.File.displayName = 'File';

package/dist/components/Image.js

@@ -63,28 +63,32 @@ exports.Image = function (_a) {
         media = field;
     }
     var dynamicMedia = media;
-    if (!media || (!dynamicMedia.editable && !dynamicMedia.value && !dynamicMedia.src)) {
+    if (!media ||
+        (!dynamicMedia.editable && !dynamicMedia.value && !dynamicMedia.src)) {
         return null;
     }
+    var imageField = dynamicMedia;
     // we likely have an experience editor value, should be a string
-    if (editable && dynamicMedia.editable) {
-        var foundImg = sitecore_jss_1.mediaApi.findEditorImageTag(dynamicMedia.editable);
+    if (editable && imageField.editable) {
+        var foundImg = sitecore_jss_1.mediaApi.findEditorImageTag(imageField.editable);
         if (!foundImg) {
-            return getEditableWrapper(dynamicMedia.editable);
+            return getEditableWrapper(imageField.editable);
         }
         var foundImgProps = utils_1.convertAttributesToReactProps(foundImg.attrs);
         // Note: otherProps may override values from foundImgProps, e.g. `style`, `className` prop
         // We do not attempt to merge.
         var imgAttrs = getImageAttrs(__assign(__assign({}, foundImgProps), otherProps), imageParams, mediaUrlPrefix);
         if (!imgAttrs) {
-            return getEditableWrapper(dynamicMedia.editable);
+            return getEditableWrapper(imageField.editable);
         }
         var imgHtml = server_1.default.renderToStaticMarkup(react_1.default.createElement("img", __assign({}, imgAttrs)));
-        var editableMarkup = dynamicMedia.editable.replace(foundImg.imgTag, imgHtml);
+        var editableMarkup = imageField.editable.replace(foundImg.imgTag, imgHtml);
         return getEditableWrapper(editableMarkup);
     }
     // some wise-guy/gal is passing in a 'raw' image object value
-    var img = dynamicMedia.src ? media : dynamicMedia.value;
+    var img = dynamicMedia.src
+        ? media
+        : dynamicMedia.value;
     if (!img) {
         return null;
     }
@@ -104,12 +108,18 @@ exports.Image.propTypes = {
             editable: prop_types_1.default.string,
         }),
     ]),
+    field: prop_types_1.default.oneOfType([
+        prop_types_1.default.shape({
+            src: prop_types_1.default.string,
+        }),
+        prop_types_1.default.shape({
+            value: prop_types_1.default.object,
+            editable: prop_types_1.default.string,
+        }),
+    ]),
     editable: prop_types_1.default.bool,
     mediaUrlPrefix: prop_types_1.default.instanceOf(RegExp),
-    imageParams: prop_types_1.default.objectOf(prop_types_1.default.oneOfType([
-        prop_types_1.default.number.isRequired,
-        prop_types_1.default.string.isRequired
-    ]).isRequired)
+    imageParams: prop_types_1.default.objectOf(prop_types_1.default.oneOfType([prop_types_1.default.number.isRequired, prop_types_1.default.string.isRequired]).isRequired),
 };
 exports.Image.defaultProps = {
     editable: true,

package/dist/components/Link.js

@@ -30,7 +30,10 @@ var prop_types_1 = __importDefault(require("prop-types"));
 exports.Link = function (_a) {
     var field = _a.field, editable = _a.editable, children = _a.children, showLinkTextWithChildrenPresent = _a.showLinkTextWithChildrenPresent, otherProps = __rest(_a, ["field", "editable", "children", "showLinkTextWithChildrenPresent"]);
     var dynamicField = field;
-    if (!field || (!dynamicField.editableFirstPart && !dynamicField.value && !dynamicField.href)) {
+    if (!field ||
+        (!dynamicField.editableFirstPart &&
+            !dynamicField.value &&
+            !dynamicField.href)) {
         return null;
     }
     var resultTags = [];
@@ -52,7 +55,9 @@ exports.Link = function (_a) {
         }
     }
     // handle link directly on field for forgetful devs
-    var link = dynamicField.href ? field : dynamicField.value;
+    var link = dynamicField.href
+        ? field
+        : dynamicField.value;
     if (!link) {
         return null;
     }
@@ -66,7 +71,7 @@ exports.Link = function (_a) {
         // information disclosure attack prevention keeps target blank site from getting ref to window.opener
         anchorAttrs.rel = 'noopener noreferrer';
     }
-    var linkText = showLinkTextWithChildrenPresent || !children ? (link.text || link.href) : null;
+    var linkText = showLinkTextWithChildrenPresent || !children ? link.text || link.href : null;
     resultTags.push(react_1.default.createElement('a', __assign(__assign(__assign({}, anchorAttrs), otherProps), { key: 'link' }), linkText, children));
     return react_1.default.createElement(react_1.default.Fragment, null, resultTags);
 };
@@ -82,6 +87,8 @@ exports.LinkPropTypes = {
         }),
     ]).isRequired,
     editable: prop_types_1.default.bool,
+    children: prop_types_1.default.node,
+    showLinkTextWithChildrenPresent: prop_types_1.default.bool,
 };
 exports.Link.propTypes = exports.LinkPropTypes;
 exports.Link.defaultProps = {

package/dist/components/Placeholder.js

@@ -30,8 +30,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var PlaceholderCommon_1 = require("./PlaceholderCommon");
 var withComponentFactory_1 = require("../enhancers/withComponentFactory");
+/**
+ * @param {HtmlElementRendering | ComponentRendering} rendering
+ */
 function isRawRendering(rendering) {
-    return !rendering.componentName && rendering.name !== undefined;
+    return (!rendering.componentName &&
+        rendering.name !== undefined);
 }
 var PlaceholderComponent = /** @class */ (function (_super) {
     __extends(PlaceholderComponent, _super);
@@ -53,7 +57,10 @@ var PlaceholderComponent = /** @class */ (function (_super) {
         var renderingData = childProps.rendering;
         var placeholderData = PlaceholderCommon_1.PlaceholderCommon.getPlaceholderDataFromRenderingData(renderingData, this.props.name);
         var components = this.getComponentsForRenderingData(placeholderData);
-        if (this.props.renderEmpty && placeholderData.every(function (rendering) { return isRawRendering(rendering); })) {
+        if (this.props.renderEmpty &&
+            placeholderData.every(function (rendering) {
+                return isRawRendering(rendering);
+            })) {
             return this.props.renderEmpty(components);
         }
         else if (this.props.render) {

package/dist/components/PlaceholderCommon.js

@@ -79,23 +79,28 @@ var PlaceholderCommon = /** @class */ (function (_super) {
     PlaceholderCommon.prototype.getComponentsForRenderingData = function (placeholderData) {
         var _this = this;
         var _a = this.props, name = _a.name, placeholderFields = _a.fields, placeholderParams = _a.params, missingComponentComponent = _a.missingComponentComponent, placeholderProps = __rest(_a, ["name", "fields", "params", "missingComponentComponent"]);
-        return placeholderData.map(function (rendering, index) {
-            var key = rendering.uid ? rendering.uid : "component-" + index;
+        return placeholderData
+            .map(function (rendering, index) {
+            var key = rendering.uid
+                ? rendering.uid
+                : "component-" + index;
             var commonProps = { key: key };
             // if the element is not a 'component rendering', render it 'raw'
-            if (!rendering.componentName && rendering.name) {
+            if (!rendering.componentName &&
+                rendering.name) {
                 return _this.createRawElement(rendering, commonProps);
             }
-            var component = _this.getComponentForRendering(rendering);
+            var componentRendering = rendering;
+            var component = _this.getComponentForRendering(componentRendering);
             if (!component) {
-                console.error("Placeholder " + name + " contains unknown component " + rendering.componentName + ". Ensure that a React component exists for it, and that it is registered in your componentFactory.js.");
+                console.error("Placeholder " + name + " contains unknown component " + componentRendering.componentName + ". Ensure that a React component exists for it, and that it is registered in your componentFactory.js.");
                 component = (missingComponentComponent !== null && missingComponentComponent !== void 0 ? missingComponentComponent : MissingComponent_1.MissingComponent);
             }
-            var finalProps = __assign(__assign(__assign(__assign(__assign({}, commonProps), placeholderProps), ((placeholderFields || rendering.fields) && {
-                fields: __assign(__assign({}, placeholderFields), rendering.fields),
-            })), ((placeholderParams || rendering.params) && {
-                params: __assign(__assign({}, placeholderParams), rendering.params),
-            })), { rendering: rendering });
+            var finalProps = __assign(__assign(__assign(__assign(__assign({}, commonProps), placeholderProps), ((placeholderFields || componentRendering.fields) && {
+                fields: __assign(__assign({}, placeholderFields), componentRendering.fields),
+            })), ((placeholderParams || componentRendering.params) && {
+                params: __assign(__assign({}, placeholderParams), componentRendering.params),
+            })), { rendering: componentRendering });
             return react_1.default.createElement(component, finalProps);
         })
             .filter(function (element) { return element; }); // remove nulls
@@ -121,7 +126,7 @@ var PlaceholderCommon = /** @class */ (function (_super) {
         /* Since we can't set the "key" attribute via React, stash it
          * so we can set in the DOM after render.
          */
-        if (attributes && attributes.chrometype === 'placeholder') {
+        if (!Array.isArray(attributes) && attributes && attributes.chrometype === 'placeholder') {
             props.phkey = elem.attributes.key; // props that get rendered as dom attribute names need to be lowercase, otherwise React complains.
             props.ref = this.addRef; // only need ref for placeholder containers, trying to add it to other components (e.g. stateless components) may result in a warning.
         }
@@ -147,20 +152,20 @@ var PlaceholderCommon = /** @class */ (function (_super) {
     PlaceholderCommon.propTypes = {
         rendering: prop_types_1.default.oneOfType([
             prop_types_1.default.object,
-            prop_types_1.default.object
+            prop_types_1.default.object,
         ]).isRequired,
         fields: prop_types_1.default.objectOf(prop_types_1.default.oneOfType([
             prop_types_1.default.object,
-            prop_types_1.default.object
+            prop_types_1.default.object,
         ]).isRequired),
         params: prop_types_1.default.objectOf(prop_types_1.default.string.isRequired),
         missingComponentComponent: prop_types_1.default.oneOfType([
             prop_types_1.default.object,
-            prop_types_1.default.func
+            prop_types_1.default.func,
         ]),
         errorComponent: prop_types_1.default.oneOfType([
             prop_types_1.default.object,
-            prop_types_1.default.object
+            prop_types_1.default.func,
         ]),
     };
     return PlaceholderCommon;

package/dist/components/SitecoreContext.js

@@ -16,6 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-explicit-any */
 var react_1 = __importDefault(require("react"));
 var prop_types_1 = __importDefault(require("prop-types"));
 exports.SitecoreContextReactContext = react_1.default.createContext({});
@@ -26,7 +27,7 @@ var SitecoreContext = /** @class */ (function (_super) {
         var _this = _super.call(this, props) || this;
         _this.setContext = function (value) {
             _this.setState({
-                context: value
+                context: value,
             });
         };
         var context = {
@@ -40,7 +41,7 @@ var SitecoreContext = /** @class */ (function (_super) {
         }
         _this.state = {
             context: context,
-            setContext: _this.setContext
+            setContext: _this.setContext,
         };
         return _this;
     }
@@ -51,7 +52,7 @@ var SitecoreContext = /** @class */ (function (_super) {
     SitecoreContext.propTypes = {
         children: prop_types_1.default.any.isRequired,
         componentFactory: prop_types_1.default.func,
-        context: prop_types_1.default.any
+        context: prop_types_1.default.any,
     };
     SitecoreContext.displayName = 'SitecoreContext';
     return SitecoreContext;

package/dist/components/VisitorIdentification.js

@@ -13,7 +13,7 @@ var VIComponent = function (_a) {
     }
     emittedVI = true;
     var script = document.createElement('script');
-    script.src = "/layouts/system/VisitorIdentification.js";
+    script.src = '/layouts/system/VisitorIdentification.js';
     script.type = 'text/javascript';
     var meta = document.createElement('meta');
     meta.name = 'VIcurrentDateTime';

package/dist/enhancers/withComponentFactory.js

@@ -16,6 +16,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var SitecoreContext_1 = require("../components/SitecoreContext");
+/**
+ * @param {React.ComponentClass<T> | React.SFC<T>} Component
+ */
 function withComponentFactory(Component) {
     return function WithComponentFactory(props) {
         return (react_1.default.createElement(SitecoreContext_1.ComponentFactoryReactContext.Consumer, null, function (context) { return react_1.default.createElement(Component, __assign({}, props, { componentFactory: props.componentFactory || context })); }));

package/dist/enhancers/withPlaceholder.js

@@ -30,7 +30,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var PlaceholderCommon_1 = require("../components/PlaceholderCommon");
 var withComponentFactory_1 = require("./withComponentFactory");
+/**
+ * @param {WithPlaceholderSpec} placeholders
+ * @param {WithPlaceholderOptions} [options]
+ */
 function withPlaceholder(placeholders, options) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return function (WrappedComponent) {
         var WithPlaceholder = /** @class */ (function (_super) {
             __extends(WithPlaceholder, _super);
@@ -57,10 +62,11 @@ function withPlaceholder(placeholders, options) {
                     ? options.resolvePlaceholderDataFromProps(childProps)
                     : childProps.rendering;
                 var definitelyArrayPlacholders = !Array.isArray(placeholders)
-                    ? [placeholders] : placeholders;
+                    ? [placeholders]
+                    : placeholders;
                 definitelyArrayPlacholders.forEach(function (placeholder) {
                     var placeholderData;
-                    if (placeholder.placeholder && placeholder.prop) {
+                    if (typeof placeholder !== 'string' && placeholder.placeholder && placeholder.prop) {
                         placeholderData = PlaceholderCommon_1.PlaceholderCommon.getPlaceholderDataFromRenderingData(renderingData, placeholder.placeholder);
                         if (placeholderData) {
                             childProps[placeholder.prop] = _this.getComponentsForRenderingData(placeholderData);

package/dist/enhancers/withSitecoreContext.js

@@ -16,6 +16,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var SitecoreContext_1 = require("../components/SitecoreContext");
+/**
+ * @param {WithSitecoreContextOptions} [options]
+ */
 function withSitecoreContext(options) {
     return function withSitecoreContextHoc(Component) {
         return function WithSitecoreContext(props) {
@@ -33,7 +36,7 @@ exports.withSitecoreContext = withSitecoreContext;
  *
  * @see https://jss.sitecore.com/docs/techniques/extending-layout-service/layoutservice-extending-context
  *
- * @param {WithSitecoreContextOptions} [options]
+ * @param {WithSitecoreContextOptions} [options] hook options
  *
  * @example
  * const EditMode = () => {
@@ -47,6 +50,7 @@ exports.withSitecoreContext = withSitecoreContext;
  *    const onClick = () => updateSitecoreContext({ pageEditing: true });
  *    return <span onClick={onClick}>Edit Mode is {sitecoreContext.pageEditing ? 'active' : 'inactive'}</span>
  * }
+ * @returns {Object} { sitecoreContext, updateSitecoreContext }
  */
 function useSitecoreContext(options) {
     var _a;
@@ -54,7 +58,7 @@ function useSitecoreContext(options) {
     var updatable = (_a = options) === null || _a === void 0 ? void 0 : _a.updatable;
     return {
         sitecoreContext: reactContext.context,
-        updateSitecoreContext: updatable ? reactContext.setContext : undefined
+        updateSitecoreContext: updatable ? reactContext.setContext : undefined,
     };
 }
 exports.useSitecoreContext = useSitecoreContext;

package/dist/utils.js

@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var style_attr_1 = require("style-attr");
 // https://stackoverflow.com/a/10426674/9324
 exports.convertKebabCasetoCamelCase = function (str) {
-    return str.replace(/^.|-./g, function (letter, index) { return (index === 0 ? letter.toLowerCase() : letter.substr(1).toUpperCase()); });
+    return str.replace(/^.|-./g, function (letter, index) {
+        return index === 0 ? letter.toLowerCase() : letter.substr(1).toUpperCase();
+    });
 };
 /**
  * https://facebook.github.io/react/docs/dom-elements.html
  * We are only concerned with style at the moment, which needs to be converted from string to object to satisfy React.
  * We don't need to convert any other attributes (that we know of), because the placeholder renders them "as-is" by using the special "is" React prop.
  * For whatever reason though, the "style" prop is still validated as needing to be an object when using the "is" prop, which is why we need to convert from string to object.
+ * @param {string} [style] style
+ * @returns {Array} converted attributes
  */
 exports.convertStyleAttribute = function (style) {
     if (style === void 0) { style = ''; }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "16.0.0-canary.8",
+  "version": "16.0.1",
   "main": "dist/index.js",
   "scripts": {
     "build": "npm run clean && tsc",
     "clean": "del-cli dist types",
-    "lint": "tslint -p . -c ./tslint.json \"src/**/*.ts\"",
+    "lint": "eslint ./src/**/*.tsx ./src/**/*.ts",
     "test": "mocha --require ts-node/register --require ./src/tests/shim.ts ./src/tests/jsdom-setup.ts ./src/tests/enzyme-setup.ts \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\"",
     "prepublishOnly": "npm run build",
-    "coverage": "nyc --require ts-node/register npm test"
+    "coverage": "nyc npm test"
   },
   "engines": {
     "node": ">=8.1"
@@ -27,40 +27,41 @@
     "@types/chai-spies": "^1.0.1",
     "@types/chai-string": "^1.4.2",
     "@types/enzyme": "^3.10.3",
-    "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/mocha": "^5.2.7",
     "@types/node": "12.7.5",
     "@types/prop-types": "^15.7.2",
-    "@types/react": "16.9.2",
-    "@types/react-dom": "^16.9.0",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
     "@types/url-parse": "^1.4.3",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "chai": "^4.2.0",
     "chai-spies": "^1.0.0",
     "chai-string": "^1.5.0",
     "del-cli": "^3.0.1",
     "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "eslint": "^7.15.0",
+    "eslint-plugin-react": "^7.21.5",
     "jsdom": "^15.1.1",
     "mocha": "^8.1.3",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
+    "nyc": "^15.1.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "react-test-renderer": "^16.9.0",
     "sinon": "^7.4.2",
     "ts-node": "^8.3.0",
-    "tslint-react": "^4.0.0",
     "typescript": "3.7.5",
     "url-parse": "^1.4.7"
   },
   "peerDependencies": {
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^16.0.0-canary.8",
+    "@sitecore-jss/sitecore-jss": "^16.0.1",
     "prop-types": "^15.7.2",
     "style-attr": "^1.3.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "be22a453049c318e28e73343974f371cc0300c7d"
+  "gitHead": "29ff3559b0c3d263ba4c84a3cfab4f1b980d9272"
 }

package/types/components/Date.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 export interface DateFieldProps {
     /** The date field data. */
+    [htmlAttributes: string]: unknown;
     field: {
         value?: string;
         editable?: string;
@@ -15,7 +16,6 @@ export interface DateFieldProps {
      * @default true
      */
     editable?: boolean;
-    render?: (date: Date | null) => React.ComponentClass<any> | React.FunctionComponent<any> | React.ReactNode;
-    [htmlAttributes: string]: any;
+    render?: (date: Date | null) => React.ComponentClass<unknown> | React.FunctionComponent<unknown> | React.ReactNode;
 }
 export declare const DateField: React.SFC<DateFieldProps>;

package/types/components/File.d.ts

@@ -1,17 +1,18 @@
 import React from 'react';
 export interface FileFieldValue {
+    [propName: string]: unknown;
     src?: string;
     title?: string;
     displayName?: string;
-    [propName: string]: any;
 }
 export interface FileField {
     value: FileFieldValue;
 }
 export interface FileProps {
+    [attributeName: string]: unknown;
     /** The file field data. */
     field: FileFieldValue | FileField;
     /** HTML attributes that will be appended to the rendered <a /> tag. */
-    [attributeName: string]: any;
+    children?: React.ReactNode;
 }
 export declare const File: React.SFC<FileProps>;

package/types/components/Image.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
 export interface ImageFieldValue {
+    [attributeName: string]: unknown;
     src?: string;
-    /** HTML attributes that will be appended to the rendered <img /> tag. */
-    [attributeName: string]: any;
 }
 export interface ImageField {
     value?: ImageFieldValue;
     editable?: string;
 }
 export interface ImageSizeParameters {
+    [attr: string]: string | number | undefined;
     /** Fixed width of the image */
     w?: number;
     /** Fixed height of the image */
@@ -25,6 +25,7 @@ export interface ImageSizeParameters {
     sc?: number;
 }
 export interface ImageProps {
+    [attributeName: string]: unknown;
     /**
      * The image field data.
      * @deprecated use field property instead
@@ -44,7 +45,7 @@ export interface ImageProps {
     imageParams?: {
         [paramName: string]: string | number;
     };
-    srcSet?: Array<ImageSizeParameters>;
+    srcSet?: ImageSizeParameters[];
     /**
      * Custom regexp that finds media URL prefix that will be replaced by `/-/jssmedia` or `/~/jssmedia`.
      * @example
@@ -53,7 +54,5 @@ export interface ImageProps {
      * /~assets/website -> /~/jssmedia/website
      */
     mediaUrlPrefix?: RegExp;
-    /** HTML attributes that will be appended to the rendered <img /> tag. */
-    [attributeName: string]: any;
 }
 export declare const Image: React.SFC<ImageProps>;

package/types/components/Link.d.ts

@@ -1,11 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 export interface LinkFieldValue {
+    [attributeName: string]: unknown;
     href?: string;
     className?: string;
+    class?: string;
     title?: string;
     target?: string;
-    [attributeName: string]: any;
+    text?: string;
 }
 export interface LinkField {
     value: LinkFieldValue;
@@ -37,4 +39,6 @@ export declare const LinkPropTypes: {
         editableLastPart: PropTypes.Requireable<string>;
     }>>;
     editable: PropTypes.Requireable<boolean>;
+    children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+    showLinkTextWithChildrenPresent: PropTypes.Requireable<boolean>;
 };

package/types/components/Placeholder.d.ts

@@ -6,16 +6,16 @@ export interface PlaceholderComponentProps extends PlaceholderProps {
      * Render props function that is called when the placeholder contains no content components.
      * Can be used to wrap the Sitecore EE empty placeholder markup in something that's visually correct
      */
-    renderEmpty?: (components: React.ReactNode[]) => React.ComponentClass<any> | React.SFC<any> | React.ReactNode;
+    renderEmpty?: (components: React.ReactNode[]) => React.ComponentClass<unknown> | React.SFC<unknown> | React.ReactNode;
     /**
      * Render props function that enables control over the rendering of the components in the placeholder.
      * Useful for techniques like wrapping each child in a wrapper component.
      */
-    render?: (components: React.ReactNode[], data: (ComponentRendering | HtmlElementRendering)[], props: PlaceholderProps) => React.ComponentClass<any> | React.SFC<any> | React.ReactNode;
+    render?: (components: React.ReactNode[], data: (ComponentRendering | HtmlElementRendering)[], props: PlaceholderProps) => React.ComponentClass<unknown> | React.SFC<unknown> | React.ReactNode;
     /**
      * Render props function that is called for each non-system component added to the placeholder.
      * Mutually exclusive with `render`. System components added during Experience Editor are automatically rendered as-is.
      */
-    renderEach?: (component: React.ReactNode, index: number) => React.ComponentClass<any> | React.SFC<any> | React.ReactNode;
+    renderEach?: (component: React.ReactNode, index: number) => React.ComponentClass<unknown> | React.SFC<unknown> | React.ReactNode;
 }
 export declare const Placeholder: (props: PlaceholderComponentProps) => JSX.Element;

package/types/components/PlaceholderCommon.d.ts

@@ -1,8 +1,12 @@
-import React from 'react';
+import React, { ComponentType } from 'react';
 import PropTypes from 'prop-types';
 import { ComponentFactory } from '../components/sharedTypes';
 import { ComponentRendering, RouteData, Field, Item, HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+declare type ErrorComponentProps = {
+    [prop: string]: unknown;
+};
 export interface PlaceholderProps {
+    [key: string]: unknown;
     /** Name of the placeholder to render. */
     name: string;
     /** Rendering data to be used when rendering the placeholder. */
@@ -30,13 +34,12 @@ export interface PlaceholderProps {
      * A component that is rendered in place of any components that are in this placeholder,
      * but do not have a definition in the componentFactory (i.e. don't have a React implementation)
      */
-    missingComponentComponent?: React.ComponentClass<any> | React.FC<any>;
+    missingComponentComponent?: React.ComponentClass<unknown> | React.FC<unknown>;
     /**
      * A component that is rendered in place of the placeholder when an error occurs rendering
      * the placeholder
      */
-    errorComponent?: React.ComponentClass<any> | React.SFC<any>;
-    [key: string]: any;
+    errorComponent?: React.ComponentClass<ErrorComponentProps> | React.FC<ErrorComponentProps>;
 }
 export declare class PlaceholderCommon<T extends PlaceholderProps> extends React.Component<T> {
     static propTypes: {
@@ -47,23 +50,34 @@ export declare class PlaceholderCommon<T extends PlaceholderProps> extends React
         params: PropTypes.Requireable<{
             [x: string]: string;
         }>;
-        missingComponentComponent: PropTypes.Requireable<React.ComponentClass<any, any> | React.FC<any>>;
-        errorComponent: PropTypes.Requireable<React.ComponentClass<any, any> | React.SFC<any>>;
+        missingComponentComponent: PropTypes.Requireable<React.ComponentClass<unknown, any> | React.FC<unknown>>;
+        errorComponent: PropTypes.Requireable<React.ComponentClass<unknown, any> | React.FC<unknown>>;
     };
-    nodeRefs: any[];
+    nodeRefs: Element[];
     state: Readonly<{
         error?: Error;
     }>;
-    static getPlaceholderDataFromRenderingData(rendering: ComponentRendering | RouteData, name: string): (ComponentRendering | HtmlElementRendering)[];
     constructor(props: T);
+    static getPlaceholderDataFromRenderingData(rendering: ComponentRendering | RouteData, name: string): (ComponentRendering | HtmlElementRendering)[];
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentDidCatch(error: Error): void;
-    getComponentsForRenderingData(placeholderData: (ComponentRendering | HtmlElementRendering)[]): (React.DetailedReactHTMLElement<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> | React.CElement<any, React.Component<any, any, any>> | null)[];
+    getComponentsForRenderingData(placeholderData: (ComponentRendering | HtmlElementRendering)[]): (React.ReactElement<{
+        [attr: string]: unknown;
+    }, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | null)[];
     getComponentForRendering(renderingDefinition: {
         componentName: string;
-    }): React.ComponentClass<{}, any> | React.FunctionComponent<{}> | null;
-    addRef(nodeRef: any): void;
-    createRawElement(elem: any, baseProps: any): React.CElement<any, React.Component<any, any, any>> | null;
+    }): ComponentType | null;
+    addRef(nodeRef: Element): void;
+    createRawElement(elem: HtmlElementRendering, baseProps: {
+        key?: string;
+    }): React.ReactElement<{
+        [attr: string]: unknown;
+        key?: string | undefined;
+        dangerouslySetInnerHTML: {
+            __html: string | null;
+        };
+    }, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
     updateKeyAttributes(): void;
 }
+export {};

package/types/components/RichText.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 export interface RichTextProps {
+    [htmlAttributes: string]: unknown;
     /** The rich text field data. */
     field?: {
         value?: string;
@@ -17,7 +18,6 @@ export interface RichTextProps {
      * @default true
      */
     editable?: boolean;
-    [htmlAttributes: string]: any;
 }
 export declare const RichText: React.SFC<RichTextProps>;
 export declare const RichTextPropTypes: {

package/types/components/SitecoreContext.d.ts

@@ -1,24 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { ComponentFactory } from './sharedTypes';
-export interface SitecoreContextProps {
+export interface SitecoreContextProps<ContextType = any> {
     componentFactory: ComponentFactory;
-    context?: any;
+    context?: ContextType;
 }
-export interface SitecoreContextState {
-    setContext: (value: any) => void;
-    context: any;
+export interface SitecoreContextState<ContextType = any> {
+    setContext: (value: ContextType) => void;
+    context: ContextType;
 }
-export declare const SitecoreContextReactContext: React.Context<SitecoreContextState>;
+export declare const SitecoreContextReactContext: React.Context<SitecoreContextState<any>>;
 export declare const ComponentFactoryReactContext: React.Context<ComponentFactory>;
-export declare class SitecoreContext extends React.Component<SitecoreContextProps, SitecoreContextState> {
+export declare class SitecoreContext<ContextType = any> extends React.Component<SitecoreContextProps<ContextType>, SitecoreContextState<ContextType>> {
     static propTypes: {
         children: PropTypes.Validator<any>;
         componentFactory: PropTypes.Requireable<(...args: any[]) => any>;
         context: PropTypes.Requireable<any>;
     };
     static displayName: string;
-    constructor(props: SitecoreContextProps);
-    setContext: (value: any) => void;
+    constructor(props: SitecoreContextProps<ContextType>);
+    setContext: (value: ContextType) => void;
     render(): JSX.Element;
 }

package/types/components/Text.d.ts

@@ -1,5 +1,6 @@
 import { FunctionComponent } from 'react';
 export interface TextProps {
+    [htmlAttributes: string]: unknown;
     /** The text field data. */
     field?: {
         value?: string;
@@ -19,6 +20,5 @@ export interface TextProps {
      * If false, HTML-encoding of the field value is disabled and the value is rendered as-is.
      */
     encode?: boolean;
-    [htmlAttributes: string]: any;
 }
 export declare const Text: FunctionComponent<TextProps>;

package/types/enhancers/withComponentFactory.d.ts

@@ -3,4 +3,7 @@ import { ComponentFactory } from '../components/sharedTypes';
 export interface ComponentFactoryProps {
     componentFactory?: ComponentFactory;
 }
+/**
+ * @param {React.ComponentClass<T> | React.SFC<T>} Component
+ */
 export declare function withComponentFactory<T extends ComponentFactoryProps>(Component: React.ComponentClass<T> | React.SFC<T>): (props: T) => JSX.Element;

package/types/enhancers/withExperienceEditorChromes.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const withExperienceEditorChromes: (WrappedComponent: React.ComponentClass<any, any> | React.SFC<any>) => React.ComponentClass<{}, any>;
+export declare const withExperienceEditorChromes: (WrappedComponent: React.ComponentClass<unknown, any> | React.SFC<unknown>) => React.ComponentClass<{}, any>;

package/types/enhancers/withPlaceholder.d.ts

@@ -8,7 +8,7 @@ export interface WithPlaceholderOptions {
      * However, if your component data is in a different prop, like say 'route' in a sample app,
      * this lets you map that.
      */
-    resolvePlaceholderDataFromProps?: (props: any) => ComponentRendering | RouteData;
+    resolvePlaceholderDataFromProps?: (props: unknown) => ComponentRendering | RouteData;
     /**
      * Function to alter the placeholder props from within the HOC. Enables the props to be
      * transformed before being used by the placeholder/HOC, for example to customize the
@@ -27,4 +27,8 @@ export interface PlaceholderToPropMapping {
     prop: string;
 }
 export declare type WithPlaceholderSpec = (string | PlaceholderToPropMapping) | (string | PlaceholderToPropMapping)[];
+/**
+ * @param {WithPlaceholderSpec} placeholders
+ * @param {WithPlaceholderOptions} [options]
+ */
 export declare function withPlaceholder(placeholders: WithPlaceholderSpec, options?: WithPlaceholderOptions): (WrappedComponent: React.ComponentClass<any, any> | React.SFC<any>) => (props: PlaceholderProps) => JSX.Element;

package/types/enhancers/withSitecoreContext.d.ts

@@ -3,13 +3,16 @@ export interface WithSitecoreContextOptions {
     updatable?: boolean;
 }
 export interface WithSitecoreContextProps {
-    sitecoreContext: any;
-    updateSitecoreContext?: ((value: any) => void) | false;
+    sitecoreContext: unknown;
+    updateSitecoreContext?: ((value: unknown) => void) | false;
 }
 export interface ComponentConsumerProps extends WithSitecoreContextProps {
     children?: ReactNode;
 }
 export declare type WithSitecoreContextHocProps<ComponentProps> = Pick<ComponentProps, Exclude<keyof ComponentProps, keyof WithSitecoreContextProps>>;
+/**
+ * @param {WithSitecoreContextOptions} [options]
+ */
 export declare function withSitecoreContext(options?: WithSitecoreContextOptions): <ComponentProps extends ComponentConsumerProps>(Component: React.ComponentType<ComponentProps>) => (props: Pick<ComponentProps, Exclude<keyof ComponentProps, "sitecoreContext" | "updateSitecoreContext">>) => JSX.Element;
 /**
  * This hook grants acсess to the current SiteCore page context
@@ -20,7 +23,7 @@ export declare function withSitecoreContext(options?: WithSitecoreContextOptions
  *
  * @see https://jss.sitecore.com/docs/techniques/extending-layout-service/layoutservice-extending-context
  *
- * @param {WithSitecoreContextOptions} [options]
+ * @param {WithSitecoreContextOptions} [options] hook options
  *
  * @example
  * const EditMode = () => {
@@ -34,8 +37,9 @@ export declare function withSitecoreContext(options?: WithSitecoreContextOptions
  *    const onClick = () => updateSitecoreContext({ pageEditing: true });
  *    return <span onClick={onClick}>Edit Mode is {sitecoreContext.pageEditing ? 'active' : 'inactive'}</span>
  * }
+ * @returns {Object} { sitecoreContext, updateSitecoreContext }
  */
-export declare function useSitecoreContext(options?: WithSitecoreContextOptions): {
-    sitecoreContext: any;
+export declare function useSitecoreContext<Context>(options?: WithSitecoreContextOptions): {
+    sitecoreContext: Context;
     updateSitecoreContext: ((value: any) => void) | undefined;
 };

package/types/index.d.ts

@@ -8,7 +8,7 @@ export { DateField } from './components/Date';
 export { Link, LinkField, LinkFieldValue, LinkProps, LinkPropTypes } from './components/Link';
 export { File, FileField } from './components/File';
 export { VisitorIdentification } from './components/VisitorIdentification';
-export { SitecoreContext, SitecoreContextState, SitecoreContextReactContext } from './components/SitecoreContext';
+export { SitecoreContext, SitecoreContextState, SitecoreContextReactContext, } from './components/SitecoreContext';
 export { withSitecoreContext, useSitecoreContext } from './enhancers/withSitecoreContext';
 export { withExperienceEditorChromes } from './enhancers/withExperienceEditorChromes';
 export { withPlaceholder } from './enhancers/withPlaceholder';

package/types/utils.d.ts

@@ -4,6 +4,14 @@ export declare const convertKebabCasetoCamelCase: (str: string) => string;
  * We are only concerned with style at the moment, which needs to be converted from string to object to satisfy React.
  * We don't need to convert any other attributes (that we know of), because the placeholder renders them "as-is" by using the special "is" React prop.
  * For whatever reason though, the "style" prop is still validated as needing to be an object when using the "is" prop, which is why we need to convert from string to object.
+ * @param {string} [style] style
+ * @returns {Array} converted attributes
  */
 export declare const convertStyleAttribute: (style?: string) => {};
-export declare const convertAttributesToReactProps: (attributes: any) => {};
+export declare const convertAttributesToReactProps: (attributes: {
+    [key: string]: unknown;
+    style?: string | undefined;
+    class?: string | undefined;
+} | null) => [] | {
+    [attr: string]: unknown;
+};