From 48cda81e90cb3f4a8d614e8d927a1b70cc47de38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davy=20H=C3=A9lard?= Date: Wed, 18 Sep 2024 12:33:28 +0200 Subject: [PATCH] Always show custom objects in the extension editor --- newIDE/app/src/EventsFunctionsList/index.js | 46 +++++++++---------- .../Preferences/PreferencesContext.js | 6 --- .../Preferences/PreferencesDialog.js | 11 ----- .../Preferences/PreferencesProvider.js | 22 --------- .../EventsFunctionsExtensionEditor.stories.js | 1 - 5 files changed, 21 insertions(+), 65 deletions(-) diff --git a/newIDE/app/src/EventsFunctionsList/index.js b/newIDE/app/src/EventsFunctionsList/index.js index 4fcb9eac8c28..3780ee6120a2 100644 --- a/newIDE/app/src/EventsFunctionsList/index.js +++ b/newIDE/app/src/EventsFunctionsList/index.js @@ -557,7 +557,6 @@ const EventsFunctionsList = React.forwardRef< const preferences = React.useContext(PreferencesContext); const gdevelopTheme = React.useContext(GDevelopThemeContext); - const { getShowEventBasedObjectsEditor } = preferences; const { currentlyRunningInAppTutorial } = React.useContext( InAppTutorialContext ); @@ -1089,30 +1088,28 @@ const EventsFunctionsList = React.forwardRef< ]; }, }, - getShowEventBasedObjectsEditor() - ? { - isRoot: true, - content: new LabelTreeViewItemContent( - extensionObjectsRootFolderId, - i18n._(t`Objects`), - { - icon: , - label: i18n._(t`Add an object`), - click: addNewEventsBasedObject, - } - ), - getChildren(i18n: I18nType): ?Array { - return objectTreeViewItems.length === 0 - ? [ - new PlaceHolderTreeViewItem( - extensionObjectsEmptyPlaceholderId, - i18n._(t`Start by adding a new object.`) - ), - ] - : objectTreeViewItems; - }, + { + isRoot: true, + content: new LabelTreeViewItemContent( + extensionObjectsRootFolderId, + i18n._(t`Objects`), + { + icon: , + label: i18n._(t`Add an object`), + click: addNewEventsBasedObject, } - : null, + ), + getChildren(i18n: I18nType): ?Array { + return objectTreeViewItems.length === 0 + ? [ + new PlaceHolderTreeViewItem( + extensionObjectsEmptyPlaceholderId, + i18n._(t`Start by adding a new object.`) + ), + ] + : objectTreeViewItems; + }, + }, { isRoot: true, content: new LabelTreeViewItemContent( @@ -1190,7 +1187,6 @@ const EventsFunctionsList = React.forwardRef< ].filter(Boolean); }, [ - getShowEventBasedObjectsEditor, addNewEventsBasedObject, addNewEventsBehavior, onSelectExtensionProperties, diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js b/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js index 9f4a7ade16f2..f649813feae4 100644 --- a/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js +++ b/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js @@ -212,7 +212,6 @@ export type PreferencesValues = {| eventsSheetCancelInlineParameter: 'cancel' | 'apply', showCommunityExtensions: boolean, showGetStartedSectionByDefault: boolean, - showEventBasedObjectsEditor: boolean, showInAppTutorialDeveloperMode: boolean, showDeprecatedInstructionWarning: boolean, openDiagnosticReportAutomatically: boolean, @@ -293,8 +292,6 @@ export type Preferences = {| setEventsSheetCancelInlineParameter: (value: string) => void, setShowCommunityExtensions: (enabled: boolean) => void, setShowGetStartedSectionByDefault: (enabled: boolean) => void, - setShowEventBasedObjectsEditor: (enabled: boolean) => void, - getShowEventBasedObjectsEditor: () => boolean, setShowInAppTutorialDeveloperMode: (enabled: boolean) => void, setOpenDiagnosticReportAutomatically: (enabled: boolean) => void, getOpenDiagnosticReportAutomatically: () => boolean, @@ -368,7 +365,6 @@ export const initialPreferences = { eventsSheetCancelInlineParameter: 'apply', showCommunityExtensions: false, showGetStartedSectionByDefault: true, - showEventBasedObjectsEditor: false, showInAppTutorialDeveloperMode: false, openDiagnosticReportAutomatically: true, showDeprecatedInstructionWarning: false, @@ -433,8 +429,6 @@ export const initialPreferences = { setEventsSheetCancelInlineParameter: () => {}, setShowCommunityExtensions: () => {}, setShowGetStartedSectionByDefault: (enabled: boolean) => {}, - setShowEventBasedObjectsEditor: (enabled: boolean) => {}, - getShowEventBasedObjectsEditor: () => false, setShowInAppTutorialDeveloperMode: (enabled: boolean) => {}, setShowDeprecatedInstructionWarning: (enabled: boolean) => {}, getOpenDiagnosticReportAutomatically: () => true, diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js b/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js index 23f53df08590..bc5bef886394 100644 --- a/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js +++ b/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js @@ -71,7 +71,6 @@ const PreferencesDialog = ({ setIsAlwaysOnTopInPreview, setEventsSheetCancelInlineParameter, setShowCommunityExtensions, - setShowEventBasedObjectsEditor, setShowInAppTutorialDeveloperMode, setOpenDiagnosticReportAutomatically, setShowDeprecatedInstructionWarning, @@ -507,16 +506,6 @@ const PreferencesDialog = ({ Contributor options - setShowEventBasedObjectsEditor(check)} - toggled={values.showEventBasedObjectsEditor} - labelPosition="right" - label={ - - Show custom objects in the extension editor (experimental) - - } - /> setShowInAppTutorialDeveloperMode(check)} toggled={values.showInAppTutorialDeveloperMode} diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js b/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js index 9025cd714eca..d5cd065347da 100644 --- a/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js +++ b/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js @@ -152,12 +152,6 @@ export default class PreferencesProvider extends React.Component { setShowGetStartedSectionByDefault: this._setShowGetStartedSection.bind( this ), - setShowEventBasedObjectsEditor: this._setShowEventBasedObjectsEditor.bind( - this - ), - getShowEventBasedObjectsEditor: this._getShowEventBasedObjectsEditor.bind( - this - ), setShowInAppTutorialDeveloperMode: this._setShowInAppTutorialDeveloperMode.bind( this ), @@ -453,22 +447,6 @@ export default class PreferencesProvider extends React.Component { ); } - _setShowEventBasedObjectsEditor(showEventBasedObjectsEditor: boolean) { - this.setState( - state => ({ - values: { - ...state.values, - showEventBasedObjectsEditor, - }, - }), - () => this._persistValuesToLocalStorage(this.state) - ); - } - - _getShowEventBasedObjectsEditor() { - return this.state.values.showEventBasedObjectsEditor; - } - _setShowInAppTutorialDeveloperMode(showInAppTutorialDeveloperMode: boolean) { this.setState( state => ({ diff --git a/newIDE/app/src/stories/componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js b/newIDE/app/src/stories/componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js index 7f23dc4a2a45..fcf05344d3d9 100644 --- a/newIDE/app/src/stories/componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js +++ b/newIDE/app/src/stories/componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js @@ -47,7 +47,6 @@ export const Default = () => ( export const WithObjectEditor = () => { const preferences: Preferences = { ...initialPreferences, - getShowEventBasedObjectsEditor: () => true, }; return (