@plusscommunities/pluss-newsletter-web-sharing 1.3.5 → 1.3.9

package/dist/index.cjs.js

@@ -988,6 +988,7 @@ var getSiteNameFromRoles = Helper.getSiteNameFromRoles;
 var onlyAlphanumeric = Helper.onlyAlphanumeric;
 var setLocalStorage = Helper.setLocalStorage;
 var readJSONFromStorage = Helper.readJSONFromStorage;
+var getSiteSettingFromState = Helper.getSiteSettingFromState;
 
 function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
@@ -2309,7 +2310,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       tagsInput: '',
       publisherTitleInput: '',
       tagged: [],
-      contacts: [],
       showTagged: false,
       showWarnings: false,
       success: false,
@@ -2323,6 +2323,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       differentPublish: false,
       isTvMode: false,
       allowComments: DEFAULT_ALLOW_COMMENTS,
+      commentVisibilityLimited: _this.props.commentVisibilityLimited,
       shouldNotify: false,
       publishDate: moment__default['default']().format('YYYY-MM-DD'),
       publishDateText: moment__default['default']().format('DD/MM/YYYY'),
@@ -2331,9 +2332,11 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       links: [],
       authorDisplay: false,
       customAuthorInput: '',
-      isAudienceValid: true,
       textFormatOpen: false,
-      selectedOption: 'audience'
+      selectedOption: 'audience',
+      isAudienceValid: true,
+      audienceType: '',
+      audienceTypeSelection: []
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", _objectSpread$8({}, _this.initialState));
@@ -2352,7 +2355,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       });
 
       newsletterActions.getOpenGraph(_this.state.loadFromWebsiteInput).then(function (res) {
-        console.log(res.data);
         var newState = {
           loadingFromWebsite: false,
           loadFromWebsiteInput: '',
@@ -2457,9 +2459,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "handleSubmit", function () {
-      // console.log(this.audienceSelector);
-      _this.audienceSelector.getWrappedInstance().onSubmit();
-
       if (!_this.validateForm()) {
         _this.setState({
           showWarnings: true
@@ -2490,6 +2489,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAudience", function (audienceType, audienceTypeSelection, isAudienceValid) {
+      _this.setState({
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
+        isAudienceValid: isAudienceValid
+      });
+    });
+
     return _this;
   }
 
@@ -2534,13 +2541,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         textFormatOpen: isOpen
       });
     }
-  }, {
-    key: "updateAudienceValidation",
-    value: function updateAudienceValidation(valid) {
-      this.setState({
-        isAudienceValid: valid
-      });
-    }
   }, {
     key: "getData",
     value: function getData() {
@@ -2561,9 +2561,12 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         isTvMode: Boolean(update.TVMode),
         isFeatured: Boolean(update.IsFeatured),
         allowComments: Boolean(update.AllowComments),
+        commentVisibilityLimited: Boolean(update.CommentVisibilityLimited),
         featuredExpiryDate: moment__default['default'](update.FeaturedExpiry || undefined).format('YYYY-MM-DD'),
         featuredExpiryDateText: moment__default['default'](update.FeaturedExpiry || undefined).format('DD/MM/YYYY'),
-        authorDisplay: update.AuthorDisplay
+        authorDisplay: update.AuthorDisplay,
+        audienceType: update.AudienceType || '',
+        audienceTypeSelection: update.AudienceTypeSelection || []
       };
 
       if (update.AuthorDisplay === 'custom') {
@@ -2688,7 +2691,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
 
       if (this.refs.publisherImage) {
         if (update.Publisher && !___default['default'].isEmpty(update.Publisher.Image)) {
-          console.log(update.Publisher.Image);
           this.refs.publisherImage.getWrappedInstance().setValue(update.Publisher.Image);
         } else {
           setTimeout(function () {
@@ -2888,8 +2890,8 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         Text: this.state.textInput,
         Thumbnail: '',
         Video: this.state.videoInput,
-        AudienceType: this.audienceSelector.getWrappedInstance().getAudienceType(),
-        AudienceTypeSelection: this.audienceSelector.getWrappedInstance().getAudienceTypeSelection(),
+        AudienceType: this.state.audienceType,
+        AudienceTypeSelection: this.state.audienceTypeSelection,
         Site: this.props.auth.site,
         Tagged: this.state.tagged,
         HasSponsor: this.state.HasSponsor,
@@ -2914,6 +2916,10 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       if (!___default['default'].isEmpty(result.Images)) {
         result.Thumbnail = getThumb300(result.Images[0]);
         result.Image = get1400(result.Images[0]);
+      }
+
+      if (result.AllowComments) {
+        result.CommentVisibilityLimited = this.state.commentVisibilityLimited;
       } // if (baseClient === 'pluss60') {
       //   const publisherImage = this.refs.publisherImage.getWrappedInstance().getValue();
       //   if (!_.isEmpty(publisherImage) || !_.isEmpty(this.state.publisherTitleInput)) {
@@ -3121,20 +3127,20 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAudience",
     value: function renderAudience() {
-      var _this9 = this;
-
+      var auth = this.props.auth;
+      var _this$state = this.state,
+          audienceType = _this$state.audienceType,
+          audienceTypeSelection = _this$state.audienceTypeSelection;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
       }, /*#__PURE__*/React__default['default'].createElement(AudienceSelector, {
-        updateValidation: this.updateAudienceValidation.bind(this),
-        ref: function ref(a) {
-          _this9.audienceSelector = a;
-        },
-        auth: this.props.auth,
+        onChange: this.onChangeAudience,
+        auth: auth,
         custom: true,
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
         disallowSingleUsers: true,
-        disallowUserType: true,
-        customSite: this.props.auth.site === 'hq' ? 'All sites' : false
+        disallowUserType: true
       }));
     }
   }, {
@@ -3232,7 +3238,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderForm",
     value: function renderForm() {
-      var _this10 = this;
+      var _this9 = this;
 
       if (this.state.success) {
         return null;
@@ -3253,14 +3259,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         label: "Title",
         placeholder: "Insert title here",
         showError: function showError() {
-          return _this10.state.showWarnings && _this10.isEmpty(_this10.state.titleInput);
+          return _this9.state.showWarnings && _this9.isEmpty(_this9.state.titleInput);
         },
         isValid: function isValid() {
-          return !_this10.isEmpty(_this10.state.titleInput);
+          return !_this9.isEmpty(_this9.state.titleInput);
         },
         value: this.state.titleInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         isRequired: true,
         alwaysShowLabel: true
@@ -3284,7 +3290,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "https://",
         value: this.state.loadFromWebsiteInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         alwaysShowLabel: true
       })))), /*#__PURE__*/React__default['default'].createElement(GenericInput, {
@@ -3294,18 +3300,18 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Enter story here",
         value: this.state.textInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         isRequired: true,
         showError: function showError() {
-          return _this10.state.showWarnings && _this10.isEmpty(_this10.state.textInput);
+          return _this9.state.showWarnings && _this9.isEmpty(_this9.state.textInput);
         },
         isValid: function isValid() {
-          return !_this10.isEmpty(_this10.state.textInput);
+          return !_this9.isEmpty(_this9.state.textInput);
         },
         help: /*#__PURE__*/React__default['default'].createElement("a", {
           onClick: function onClick() {
-            _this10.toggleTextFormat(true);
+            _this9.toggleTextFormat(true);
           },
           className: "pointer"
         }, "Text formatting"),
@@ -3328,7 +3334,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAddAttachment",
     value: function renderAddAttachment() {
-      var _this11 = this;
+      var _this10 = this;
 
       if (this.inputsDisabled()) {
         return null;
@@ -3336,7 +3342,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
 
       return /*#__PURE__*/React__default['default'].createElement(FileInput, {
         ref: function ref(_ref) {
-          _this11.pdFileInput = _ref;
+          _this10.pdFileInput = _ref;
         },
         style: {
           height: 120,
@@ -3350,7 +3356,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAttachments",
     value: function renderAttachments() {
-      var _this12 = this;
+      var _this11 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3371,9 +3377,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "Enter Title",
           value: link.Text,
           onChange: function onChange(e) {
-            return _this12.handleLinkChange(index, 'Text', e.target.value);
+            return _this11.handleLinkChange(index, 'Text', e.target.value);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3387,9 +3393,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "https://",
           value: link.Url,
           onChange: function onChange(e) {
-            return _this12.handleLinkChange(index, 'Url', e.target.value);
+            return _this11.handleLinkChange(index, 'Url', e.target.value);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3399,7 +3405,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           className: "removeoption pdfAttachmentInput_remove",
           icon: "remove-circle",
           onClick: function onClick() {
-            _this12.removeLink(index);
+            _this11.removeLink(index);
           }
         }));
       }), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3437,9 +3443,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "Title",
           value: attachment.Title,
           onChange: function onChange(e) {
-            return _this12.handleAttachmentChange(index, 'Title', e);
+            return _this11.handleAttachmentChange(index, 'Title', e);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3449,7 +3455,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           className: "removeoption pdfAttachmentInput_remove",
           icon: "remove-circle",
           onClick: function onClick() {
-            _this12.removeAttachment(index);
+            _this11.removeAttachment(index);
           }
         }));
       }), this.renderAddAttachment()));
@@ -3457,7 +3463,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderFeatured",
     value: function renderFeatured() {
-      var _this13 = this;
+      var _this12 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3468,7 +3474,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this13.setState({
+            return _this12.setState({
               isFeatured: true
             });
           }
@@ -3476,7 +3482,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this13.setState({
+            return _this12.setState({
               isFeatured: false
             });
           }
@@ -3494,11 +3500,11 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         alwaysShowLabel: true,
         value: this.state.featuredExpiryDateText,
         onChange: function onChange(e) {
-          return _this13.handleExpiryDateTextChange(e.target.value);
+          return _this12.handleExpiryDateTextChange(e.target.value);
         },
         onClick: function onClick(e) {
-          return _this13.setState({
-            showExpiryDate: !_this13.state.showExpiryDate
+          return _this12.setState({
+            showExpiryDate: !_this12.state.showExpiryDate
           });
         }
       }), this.state.showExpiryDate && /*#__PURE__*/React__default['default'].createElement(DatePicker, {
@@ -3509,24 +3515,33 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderComments",
     value: function renderComments() {
-      var _this14 = this;
+      var _this13 = this;
 
       if (___default['default'].includes(this.props.auth.hidden, values.optionNewsComments)) return null;
-      return /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+      return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(CheckBox, {
         className: "marginTop-16",
         label: "Allow comments",
         isActive: this.state.allowComments,
         onChange: function onChange() {
-          _this14.setState({
-            allowComments: !_this14.state.allowComments
+          _this13.setState({
+            allowComments: !_this13.state.allowComments
           });
         }
-      });
+      }), this.state.allowComments && /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+        className: "marginTop-16",
+        label: "Users can only see their own comments",
+        isActive: this.state.commentVisibilityLimited,
+        onChange: function onChange() {
+          _this13.setState({
+            commentVisibilityLimited: !_this13.state.commentVisibilityLimited
+          });
+        }
+      }));
     }
   }, {
     key: "renderTags",
     value: function renderTags() {
-      var _this15 = this;
+      var _this14 = this;
 
       if (!newsHaveTags) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3539,7 +3554,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Humour, Social, etc.",
         value: this.state.tagsInput,
         onChange: function onChange(e) {
-          return _this15.handleChange(e);
+          return _this14.handleChange(e);
         },
         alwaysShowLabel: true
       }));
@@ -3547,7 +3562,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderNotify",
     value: function renderNotify() {
-      var _this16 = this;
+      var _this15 = this;
 
       if (this.state.eventId || ___default['default'].includes(this.props.auth.hidden, 'eventNotifications')) {
         return null;
@@ -3562,7 +3577,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this16.setState({
+            return _this15.setState({
               shouldNotify: true
             });
           }
@@ -3570,7 +3585,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this16.setState({
+            return _this15.setState({
               shouldNotify: false
             });
           }
@@ -3585,7 +3600,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTvMode",
     value: function renderTvMode() {
-      var _this17 = this;
+      var _this16 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "marginTop-16"
@@ -3596,7 +3611,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this17.setState({
+            return _this16.setState({
               isTvMode: true
             });
           }
@@ -3604,7 +3619,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this17.setState({
+            return _this16.setState({
               isTvMode: false
             });
           }
@@ -3616,7 +3631,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAuthor",
     value: function renderAuthor() {
-      var _this18 = this;
+      var _this17 = this;
 
       if (this.props.forceNewsAuthorName) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3628,7 +3643,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: false
             });
           }
@@ -3642,7 +3657,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes, use my name',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: 'name'
             });
           }
@@ -3656,7 +3671,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes, use the following:',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: 'custom'
             });
           }
@@ -3670,14 +3685,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Enter custom name",
         value: this.state.customAuthorInput,
         onChange: function onChange(e) {
-          return _this18.handleChange(e);
+          return _this17.handleChange(e);
         }
       }));
     }
   }, {
     key: "renderVideo",
     value: function renderVideo() {
-      var _this19 = this;
+      var _this18 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3689,7 +3704,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "https://...",
         value: this.state.videoInput,
         onChange: function onChange(e) {
-          return _this19.handleChange(e);
+          return _this18.handleChange(e);
         },
         alwaysShowLabel: true
       }));
@@ -3758,23 +3773,23 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderResults",
     value: function renderResults() {
-      var _this20 = this;
+      var _this19 = this;
 
       if (this.state.userSearch == null) {
         return null;
       }
 
-      var source = ___default['default'].sortBy(___default['default'].filter(this.state.contacts, function (ev) {
-        return ev.displayName.toLowerCase().indexOf(_this20.state.userSearch.toLowerCase()) > -1 && ev.category === 'resident';
+      var source = ___default['default'].sortBy(___default['default'].filter(this.props.users, function (ev) {
+        return ev.displayName.toLowerCase().indexOf(_this19.state.userSearch.toLowerCase()) > -1 && ev.category === 'resident';
       }), 'displayName');
 
       return source.map(function (user, index) {
         return /*#__PURE__*/React__default['default'].createElement(UserListing, {
           user: user,
-          onClick: _this20.tagUser.bind(_this20, user),
+          onClick: _this19.tagUser.bind(_this19, user),
           key: user.id,
-          rightContent: _this20.renderTick(user),
-          subContent: _this20.renderSubText(user),
+          rightContent: _this19.renderTick(user),
+          subContent: _this19.renderSubText(user),
           size: 50
         });
       });
@@ -3782,7 +3797,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTagged",
     value: function renderTagged() {
-      var _this21 = this;
+      var _this20 = this;
 
       if (!this.state.showTagged || this.state.success) {
         return null;
@@ -3804,7 +3819,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           user: user,
           key: user.userId,
           whiteText: true,
-          rightContent: _this21.renderRemoveTag(user)
+          rightContent: _this20.renderRemoveTag(user)
         });
       })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "marginTop-24"
@@ -3820,7 +3835,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Search for user",
         value: this.state.userSearch,
         onChange: function onChange(e) {
-          return _this21.handleSearchChange(e);
+          return _this20.handleSearchChange(e);
         }
       }), this.renderResults()))));
     }
@@ -3848,7 +3863,8 @@ var mapStateToProps$4 = function mapStateToProps(state) {
   return {
     auth: auth,
     users: allUsers,
-    forceNewsAuthorName: auth && auth.siteSettings && auth.siteSettings[values.optionForceNewsAuthorName]
+    forceNewsAuthorName: getSiteSettingFromState(state, values.optionForceNewsAuthorName),
+    commentVisibilityLimited: getSiteSettingFromState(state, 'CommentVisibilityLimited')
   };
 };
 
@@ -3894,11 +3910,21 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
       publishDate: moment__default['default']().format('YYYY-MM-DD'),
       publishDateText: moment__default['default']().format('DD/MM/YYYY'),
       publishTime: '12:00pm',
-      isAudienceValid: true
+      isAudienceValid: true,
+      audienceType: '',
+      audienceTypeSelection: []
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", _objectSpread$7({}, _this.initialState));
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAudience", function (audienceType, audienceTypeSelection, isAudienceValid) {
+      _this.setState({
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
+        isAudienceValid: isAudienceValid
+      });
+    });
+
     return _this;
   }
 
@@ -3988,13 +4014,6 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
 
       return moment__default['default'].utc(this.state.update.Timestamp).local().format('D MMM');
     }
-  }, {
-    key: "updateAudienceValidation",
-    value: function updateAudienceValidation(valid) {
-      this.setState({
-        isAudienceValid: valid
-      });
-    }
   }, {
     key: "validatePublishTime",
     value: function validatePublishTime() {
@@ -4026,8 +4045,6 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
     value: function handleSubmit() {
       var _this3 = this;
 
-      this.audienceSelector.getWrappedInstance().onSubmit();
-
       if (!this.validateForm()) {
         return;
       }
@@ -4042,8 +4059,8 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
         Timestamp: timeToUse.toISOString(),
         UnixTimestamp: timeToUse.valueOf(),
         Site: this.props.auth.site,
-        AudienceType: this.audienceSelector.getWrappedInstance().getAudienceType(),
-        AudienceTypeSelection: this.audienceSelector.getWrappedInstance().getAudienceTypeSelection(),
+        AudienceType: this.state.audienceType,
+        AudienceTypeSelection: this.state.audienceTypeSelection,
         IsFeatured: this.state.isFeatured,
         FeaturedExpiry: this.state.isFeatured ? getUTCFromTimeDatePickers(this.state.featuredExpiryDate, '23:59').valueOf() : undefined,
         AllowComments: this.state.allowComments
@@ -4209,16 +4226,14 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "padding-60 paddingVertical-40 bottomDivideBorder"
       }, /*#__PURE__*/React__default['default'].createElement(AudienceSelector, {
-        updateValidation: this.updateAudienceValidation.bind(this),
-        ref: function ref(a) {
-          _this5.audienceSelector = a;
-        },
+        onChange: this.onChangeAudience,
         auth: this.props.auth,
         custom: true,
-        maxWidth: 300,
+        audienceType: this.state.audienceType,
+        audienceTypeSelection: this.state.audienceTypeSelection,
         disallowSingleUsers: true,
         disallowUserType: true,
-        customSite: this.props.auth.site === 'hq' ? 'All sites' : false
+        maxWidth: 300
       })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "padding-60 paddingVertical-40 bottomDivideBorder"
       }, /*#__PURE__*/React__default['default'].createElement("p", {