Add isEditedPostSaveable logic to isPostAutosaveable

editor/components/autosave-monitor/index.js

@@ -6,18 +6,17 @@ import { withSelect, withDispatch } from '@wordpress/data';
 
 export class AutosaveMonitor extends Component {
 	componentDidUpdate( prevProps ) {
-		const { isDirty, isSaveable, isAutosaveable, isAutosaving } = this.props;
+		const { isDirty, isAutosaveable, isAutosaving } = this.props;
 
 		// Prevent autosaves if an autosave is in progress.
 		if ( isAutosaving ) {
 			return;
 		}
 		if (
 			prevProps.isDirty !== isDirty ||
-			prevProps.isSaveable !== isSaveable ||
 			prevProps.isAutosaveable !== isAutosaveable
 		) {
-			this.toggleTimer( isDirty && isSaveable && isAutosaveable );
+			this.toggleTimer( isDirty && isAutosaveable );
 		}
 	}
 
@@ -45,15 +44,13 @@ export default compose( [
 	withSelect( ( select ) => {
 		const {
 			isEditedPostDirty,
-			isEditedPostSaveable,
 			isPostAutosaveable,
 			getEditorSettings,
 			isAutosavingPost,
 		} = select( 'core/editor' );
 		const { autosaveInterval } = getEditorSettings();
 		return {
 			isDirty: isEditedPostDirty(),
-			isSaveable: isEditedPostSaveable(),
 			isAutosaveable: isPostAutosaveable(),
 			autosaveInterval: autosaveInterval,
 			isAutosaving: isAutosavingPost(),

editor/store/selectors.js

@@ -312,6 +312,11 @@ export function isPostAutosaveable( state ) {
 		return false;
 	}
 
+	// A post must contain a title, an excerpt, or non-empty content to be valid for autosaving.
+	if ( ! isEditedPostSaveable( state ) ) {
+		return false;
+	}
+
 	// If we don't already have an autosave, the post is autosaveable.
 	if ( ! hasAutosave( state ) ) {
 		return true;