Make sticky an optional dependency, remove old modal override (#158)

* fix: sticky should be an optional dependency Fixes #146 Signed-off-by: Alexander Skvortsov <[email protected]> * fix: remove hacky modal override stacking modals is now in core, and this implementation is buggy Signed-off-by: Alexander Skvortsov <[email protected]> * Update js/src/forum/components/FeaturedBlogItem.tsx --------- Signed-off-by: Alexander Skvortsov <[email protected]> Co-authored-by: David Wheatley <[email protected]>
v17development · May 14, 2023 · 63eefad · 63eefad
1 parent c67238a
commit 63eefad
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 237 deletions.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,7 @@
         "color": "#ffffff"
       },
       "optional-dependencies": [
+        "flarum/sticky",
         "fof/discussion-language",
         "askvortsov/flarum-rich-text"
       ]

diff --git a/js/src/forum/components/FeaturedBlogItem.tsx b/js/src/forum/components/FeaturedBlogItem.tsx
@@ -30,7 +30,9 @@ export default class FeaturedBlogItem extends Component<Attrs> {
       100
     );
 
-    if (article.isSticky()) {
+    // Sticky is an optional dependency, so we can't
+    // assume method existence.
+    if (article.isSticky?.()) {
       items.add('sticky', <span class="BlogFeatured-list-item-isSticky dataItem">{icon('fas fa-thumbtack')}</span>, 80);
     }
 

diff --git a/js/src/forum/index.ts b/js/src/forum/index.ts
@@ -13,10 +13,6 @@ import addSidebarNav from './utils/addSidebarNav';
 
 import BlogItem from './pages/BlogItem';
 
-// Create our own modal manager
-import OverrideModalState from './states/OverrideModalState';
-import overrideModalManager from './utils/overrideModalManager';
-
 // Register Flarum Blog
 app.initializers.add(
   'v17development-flarum-blog',
@@ -57,13 +53,6 @@ app.initializers.add(
 
     // Add a link to the blog to the IndexPage sidebar, if enabled.
     addSidebarNav();
-
-    /**
-     * Notice from V17: Temporary override due to lack of multi-dialogs!
-     *
-     * We'll open a PR to support multi-dialog to the Flarum main repo
-     */
-    overrideModalManager();
   },
   -100000
 );

diff --git a/js/src/forum/states/OverrideModalState.ts b/js/src/forum/states/OverrideModalState.ts
diff --git a/js/src/forum/utils/overrideModalManager.js b/js/src/forum/utils/overrideModalManager.js