API Move form factory handling into EditFormFactory

src/Controllers/ElementalAreaController.php

@@ -1,14 +1,14 @@
 <?php
+
 namespace DNADesign\Elemental\Controllers;
 
+use DNADesign\Elemental\Forms\EditFormFactory;
 use DNADesign\Elemental\Models\BaseElement;
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Forms\DefaultFormFactory;
 use SilverStripe\Forms\Form;
-use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
 
 /**
  * Controller for "ElementalArea" - handles loading and saving of in-line edit forms in an elemental area in admin
@@ -59,7 +59,7 @@ public function elementForm(HTTPRequest $request = null)
      */
     public function getElementForm($elementID)
     {
-        $scaffolder = Injector::inst()->get(DefaultFormFactory::class);
+        $scaffolder = Injector::inst()->get(EditFormFactory::class);
         $element = BaseElement::get()->byID($elementID);
 
         if (!$element) {
@@ -73,14 +73,6 @@ public function getElementForm($elementID)
             ['Record' => $element]
         );
 
-        $form->addExtraClass('form--no-dividers');
-
-        /** @var HTMLEditorField $contentField */
-        $contentField = $form->Fields()->fieldByName('Root.Main.HTML');
-        if ($contentField) {
-            $contentField->setRows(5);
-        }
-
         return $form;
     }
 }

src/Forms/EditFormFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace DNADesign\Elemental\Forms;
+
+use SilverStripe\Control\RequestHandler;
+use SilverStripe\Forms\DefaultFormFactory;
+use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
+
+class EditFormFactory extends DefaultFormFactory
+{
+    public function getForm(RequestHandler $controller = null, $name = self::DEFAULT_NAME, $context = [])
+    {
+        $form = parent::getForm($controller, $name, $context);
+
+        // Remove divider lines between form fields
+        $form->addExtraClass('form--no-dividers');
+
+        return $form;
+    }
+
+    protected function getFormFields(RequestHandler $controller = null, $name, $context = [])
+    {
+        $fields = parent::getFormFields($controller, $name, $context);
+
+        /** @var HTMLEditorField $contentField */
+        $contentField = $fields->fieldByName('Root.Main.HTML');
+        if ($contentField) {
+            $contentField->setRows(5);
+        }
+
+        return $fields;
+    }
+}
+