diff --git a/scheduler_repeat/scheduler_repeat.info.yml b/scheduler_repeat/scheduler_repeat.info.yml
new file mode 100644
index 000000000..e5c8b114d
--- /dev/null
+++ b/scheduler_repeat/scheduler_repeat.info.yml
@@ -0,0 +1,8 @@
+name: Scheduler Repeat
+type: module
+description: 'Allows content editors specifying repeating schedule for publishing and unpublishing.'
+core: 8.x
+core_version_requirement: ^8 || ^9
+dependencies:
+  - drupal:node
+  - scheduler:scheduler
diff --git a/scheduler_repeat/scheduler_repeat.module b/scheduler_repeat/scheduler_repeat.module
new file mode 100644
index 000000000..1170fc7ef
--- /dev/null
+++ b/scheduler_repeat/scheduler_repeat.module
@@ -0,0 +1,219 @@
+<?php
+
+/**
+ * @file
+ * Scheduler Repeat provides options for repeat publishing and un-publishing.
+ */
+
+use Drupal\Component\Plugin\Exception\PluginException;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\node\NodeInterface;
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function scheduler_repeat_entity_base_field_info(EntityTypeInterface $entity_type) {
+  if ($entity_type->id() === 'node') {
+    $fields['scheduler_repeat'] = BaseFieldDefinition::create('scheduler_repeater')
+      ->setLabel(t('Scheduler Repeat'))
+      ->setDisplayOptions('form', [
+        'type' => 'scheduler_repeater_widget',
+        'weight' => 31,
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE)
+      ->addConstraint('SchedulerRepeat');
+
+    return $fields;
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter() for node_form().
+ */
+function scheduler_repeat_form_node_form_alter(&$form, FormStateInterface $form_state) {
+  if (!isset($form['publish_on']) || !isset($form['unpublish_on'])) {
+    // Remove the repeat selection field.
+    // @todo What if scheduler_form_node_form_alter() is invoked AFTER this?
+    // @todo What if scheduler date fields are configured as hidden?
+    unset($form['scheduler_repeat']);
+    return;
+  }
+  // Move the repeat widget to the 'scheduler_settings' fieldset.
+  $form['scheduler_repeat']['#group'] = 'scheduler_settings';
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_presave() for node entities.
+ */
+function scheduler_repeat_node_presave(EntityInterface $node) {
+  if (!$repeater = _scheduler_repeat_get_repeater($node)) {
+    _scheduler_repeat_clear_next_occurence($node);
+    return;
+  }
+
+  if (!$next_publish_on = _scheduler_repeat_next_publish_on($repeater, $node)) {
+    _scheduler_repeat_clear_next_occurence($node);
+    return;
+  }
+
+  if (!$next_unpublish_on = _scheduler_repeat_next_unpublish_on($repeater, $node)) {
+    _scheduler_repeat_clear_next_occurence($node);
+    return;
+  }
+
+  if ($next_publish_on > $next_unpublish_on) {
+    _scheduler_repeat_log_error(
+      '@repeater repeater calculated conflicting next occurence for node @nid: @from -> @to',
+      [
+        '@repeater' => $node->scheduler_repeat->plugin,
+        '@nid' => $node->id(),
+        '@from' => date("Y-m-d H:i:s", $next_publish_on),
+        '@to' => date("Y-m-d H:i:s", $next_unpublish_on),
+      ]
+    );
+    return;
+  }
+
+  $node->set('scheduler_repeat', [
+    'plugin' => $node->scheduler_repeat->plugin,
+    'next_publish_on' => $next_publish_on,
+    'next_unpublish_on' => $next_unpublish_on,
+  ]);
+}
+
+/**
+ * Remove the repeat plugin and both 'next' date values.
+ *
+ * @param \Drupal\node\NodeInterface $node
+ *   The node object to update.
+ */
+function _scheduler_repeat_clear_next_occurence(NodeInterface &$node) {
+  $node->set('scheduler_repeat', [
+    'plugin' => NULL,
+    'next_publish_on' => NULL,
+    'next_unpublish_on' => NULL,
+  ]);
+}
+
+/**
+ * Get the next publish_on date.
+ *
+ * If the existing publish_on date is empty, return the stored next_publish_on
+ * date if availbale. If publish_on date is set, use $repeater to calculate the
+ * next occurence until the value is in the future.
+ *
+ * @param \Drupal\scheduler_repeat\SchedulerRepeaterInterface $repeater
+ *   The repeater plugin.
+ * @param \Drupal\node\NodeInterface $node
+ *   The node to use.
+ *
+ * @return mixed|null
+ *   The next publish_on date
+ */
+function _scheduler_repeat_next_publish_on(SchedulerRepeaterInterface $repeater, NodeInterface $node) {
+  if ($node->get('publish_on')->isEmpty()) {
+    return !empty($node->get('scheduler_repeat')->next_publish_on) ? $node->get('scheduler_repeat')->next_publish_on : NULL;
+  }
+
+  $next_publish_on = $repeater->calculateNextPublishedOn($node->get('publish_on')->value);
+  $request_time = \Drupal::time()->getRequestTime();
+  while ($next_publish_on < $request_time) {
+    $next_publish_on = $repeater->calculateNextPublishedOn($next_publish_on);
+  }
+  return $next_publish_on;
+}
+
+/**
+ * Get the next unpublish_on date.
+ *
+ * If the existing unpublish_on date is empty, return the stored
+ * next_unpublish_on date if available. If unpublish_on date is set, use
+ * $repeater to calculate the next occurence until the value is in the future.
+ *
+ * @param \Drupal\scheduler_repeat\SchedulerRepeaterInterface $repeater
+ *   The repeater plugin.
+ * @param \Drupal\node\NodeInterface $node
+ *   The node to use.
+ *
+ * @return mixed|null
+ *   The next unpublish_on date
+ */
+function _scheduler_repeat_next_unpublish_on(SchedulerRepeaterInterface $repeater, NodeInterface $node) {
+  if ($node->get('unpublish_on')->isEmpty()) {
+    return !empty($node->get('scheduler_repeat')->next_unpublish_on) ? $node->get('scheduler_repeat')->next_unpublish_on : NULL;
+  }
+
+  $next_unpublish_on = $repeater->calculateNextUnpublishedOn($node->get('unpublish_on')->value);
+  $request_time = \Drupal::time()->getRequestTime();
+  while ($next_unpublish_on < $request_time) {
+    $next_unpublish_on = $repeater->calculateNextUnpublishedOn($next_unpublish_on);
+  }
+  return $next_unpublish_on;
+}
+
+/**
+ * Get the repeat plugin if one is defined for the node.
+ *
+ * @param \Drupal\node\NodeInterface $node
+ *   The node object to check.
+ *
+ * @return \Drupal\scheduler_repeat\SchedulerRepeaterInterface|null
+ *   The repeat plugin instance.
+ */
+function _scheduler_repeat_get_repeater(NodeInterface $node) {
+  if (empty($node->scheduler_repeat->plugin)) {
+    return NULL;
+  }
+  // @todo When we cater for optional associated data, the id can be extracted,
+  // and the other values added into $plugin_data.
+  $plugin_id = $node->scheduler_repeat->plugin;
+  $plugin_data = ['node' => $node];
+
+  /** @var \Drupal\scheduler_repeat\SchedulerRepeaterManager $scheduler_repeater_manager */
+  $scheduler_repeater_manager = \Drupal::service('plugin.manager.scheduler_repeat.repeater');
+
+  /** @var \Drupal\scheduler_repeat\SchedulerRepeaterInterface $repeater */
+  try {
+    $repeater = $scheduler_repeater_manager->createInstance($plugin_id, $plugin_data);
+  }
+  catch (PluginException $e) {
+    _scheduler_repeat_log_warning('Could not create scheduler repeater instance: @message', ['@message' => $e->getMessage()]);
+    return NULL;
+  }
+
+  return $repeater;
+}
+
+/**
+ * Write an error to the db log.
+ *
+ * @param string $message
+ *   The message text.
+ * @param array $context
+ *   Context variables for substitution.
+ *
+ * @todo This is only called once. Move into scheduler_repeat_node_presave?.
+ */
+function _scheduler_repeat_log_error(string $message, array $context) {
+  \Drupal::logger('scheduler_repeat')->error($message, $context);
+}
+
+/**
+ * Write a warning to the db log.
+ *
+ * @param string $message
+ *   The message text.
+ * @param array $context
+ *   Context variables for substitution.
+ *
+ * @todo This is only called once. Move into _scheduler_repeat_get_repeater?.
+ */
+function _scheduler_repeat_log_warning(string $message, array $context) {
+  \Drupal::logger('scheduler_repeat')->warning($message, $context);
+}
diff --git a/scheduler_repeat/scheduler_repeat.services.yml b/scheduler_repeat/scheduler_repeat.services.yml
new file mode 100644
index 000000000..b7bad8688
--- /dev/null
+++ b/scheduler_repeat/scheduler_repeat.services.yml
@@ -0,0 +1,9 @@
+services:
+  plugin.manager.scheduler_repeat.repeater:
+    class: Drupal\scheduler_repeat\SchedulerRepeaterManager
+    parent: default_plugin_manager
+    arguments: ['@entity_type.manager', '@config.factory']
+  scheduler_repeat.event_subscriber:
+    class: Drupal\scheduler_repeat\EventSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/scheduler_repeat/src/Annotation/SchedulerRepeater.php b/scheduler_repeat/src/Annotation/SchedulerRepeater.php
new file mode 100644
index 000000000..b2b50ad64
--- /dev/null
+++ b/scheduler_repeat/src/Annotation/SchedulerRepeater.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines repeater plugin.
+ *
+ * @code
+ * @SchedulerRepeater(
+ *   id = "example",
+ *   label = @Translation("Example Label"),
+ *   weight = 1
+ * )
+ * @endcode
+ *
+ * @Annotation
+ */
+class SchedulerRepeater extends Plugin {
+
+  /**
+   * ID of the repeat plugin.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * Label of the repeat plugin.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
+   */
+  public $label;
+
+  /**
+   * Weight of the repeat plugin.
+   *
+   * This is used for sorting the plugins in the form selction list.
+   *
+   * @var int
+   */
+  public $weight;
+
+}
diff --git a/scheduler_repeat/src/EventSubscriber.php b/scheduler_repeat/src/EventSubscriber.php
new file mode 100644
index 000000000..cad343eec
--- /dev/null
+++ b/scheduler_repeat/src/EventSubscriber.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\scheduler_repeat;
+
+use Drupal\scheduler\SchedulerEvent;
+use Drupal\scheduler\SchedulerEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * These events allow modules to react to the Scheduler process being performed.
+ *
+ * They are all triggered during Scheduler cron processing with the exception of
+ * 'pre_publish_immediately' and 'publish_immediately' which are triggered from
+ * scheduler_node_presave().
+ */
+class EventSubscriber implements EventSubscriberInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    // The values in the arrays give the function names below.
+    $events = [];
+    $events[SchedulerEvents::UNPUBLISH][] = ['unpublish'];
+    return $events;
+  }
+
+  /**
+   * Operations to perform after Scheduler unpublishes a node.
+   *
+   * @param \Drupal\scheduler\SchedulerEvent $event
+   *   The scheduler event object.
+   */
+  public function unpublish(SchedulerEvent $event) {
+    /** @var \Drupal\node\Entity\Node $node */
+    $node = $event->getNode();
+
+    // The content has now been unpublished so get the stored dates for the next
+    // period. We do not want to check if a repeat plugin exists, we only need
+    // to check if the two 'next' dates are available. In future we could set a
+    // 'stop after' date which would remove the repeat plugin but leave the last
+    // pair of 'next' dates for use here.
+    $next_publish_on = $node->get('scheduler_repeat')->next_publish_on;
+    $next_unpublish_on = $node->get('scheduler_repeat')->next_unpublish_on;
+    if (empty($next_publish_on) || empty($next_unpublish_on)) {
+      // Do not have both dates, so cannot set the next period.
+      return;
+    }
+    // Set the new period publish_on and unpublish_on values.
+    $node->set('publish_on', $next_publish_on);
+    $node->set('unpublish_on', $next_unpublish_on);
+    $event->setNode($node);
+  }
+
+}
diff --git a/scheduler_repeat/src/InvalidPluginTypeException.php b/scheduler_repeat/src/InvalidPluginTypeException.php
new file mode 100644
index 000000000..55d94bd3a
--- /dev/null
+++ b/scheduler_repeat/src/InvalidPluginTypeException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\scheduler_repeat;
+
+/**
+ * Defines an exception for the wrong type of repeater plugin.
+ *
+ * This is thrown when the Scheduler Repeat manager returns a wrong type of
+ * repeater plugin.
+ *
+ * @see SchedulerRepeatConstraintValidator::initializeRepeaterWithPlugin()
+ */
+class InvalidPluginTypeException extends \Exception {}
diff --git a/scheduler_repeat/src/MissingOptionNodeException.php b/scheduler_repeat/src/MissingOptionNodeException.php
new file mode 100644
index 000000000..fbd755835
--- /dev/null
+++ b/scheduler_repeat/src/MissingOptionNodeException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\scheduler_repeat;
+
+/**
+ * Defines an exception for missing node object.
+ *
+ * This is thrown when the node is not passed in the $options parameter.
+ *
+ * @see SchedulerRepeaterBase::__construct()
+ */
+class MissingOptionNodeException extends \Exception {
+}
diff --git a/scheduler_repeat/src/Plugin/Field/FieldFormatter/SchedulerRepeaterFormatter.php b/scheduler_repeat/src/Plugin/Field/FieldFormatter/SchedulerRepeaterFormatter.php
new file mode 100644
index 000000000..1b45f2681
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/Field/FieldFormatter/SchedulerRepeaterFormatter.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\Field\FieldFormatter;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\node\NodeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Plugin implementation of the 'scheduler_repeater' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "scheduler_repeater_formatter",
+ *   label = @Translation("Scheduler repeater"),
+ *   field_types = {
+ *     "scheduler_repeater"
+ *   }
+ * )
+ */
+class SchedulerRepeaterFormatter extends FormatterBase {
+
+  /**
+   * The Scheduler Repeat plugin manager.
+   *
+   * @var \Drupal\scheduler_repeat\SchedulerRepeaterManager
+   */
+  protected $pluginManager;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * Constructs a FormatterBase object.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Any third party settings.
+   * @param \Drupal\Core\Render\Element\ContainerInterface $container
+   *   Container which is being used to inject plugin manager and date
+   *   formatter.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, ContainerInterface $container) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->pluginManager = $container->get('plugin.manager.scheduler_repeat.repeater');
+    $this->dateFormatter = $container->get('date.formatter');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($plugin_id, $plugin_definition, $configuration['field_definition'], $configuration['settings'], $configuration['label'], $configuration['view_mode'], $configuration['third_party_settings'], $container);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+    foreach ($items as $delta => $item) {
+      $label = $this->pluginManager->getDefinition($item->plugin)['label'];
+      $occurence = $this->renderOccurence($item->getEntity());
+      $elements[$delta] = [
+        '#markup' => Xss::filter("$label ($occurence)"),
+      ];
+    }
+    return $elements;
+  }
+
+  /**
+   * Render the two next occurence dates, for use in views.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   The node object to use.
+   *
+   * @return string
+   *   A string consisting of the next publish_on and unpublish_on dates.
+   *
+   * @throws \Drupal\Core\TypedData\Exception\MissingDataException
+   */
+  protected function renderOccurence(NodeInterface $node) {
+    return $this->renderDate($node->get('scheduler_repeat')->next_publish_on) . ' - ' . $this->renderDate($node->get('scheduler_repeat')->next_unpublish_on);
+  }
+
+  /**
+   * Render an individual date timestamp into a string.
+   *
+   * @todo Make this configurable? Pass a format parameter.
+   *
+   * @param int $timestamp
+   *   The the date integer value to render.
+   *
+   * @return string
+   *   The date rendered as a text value in 'short' format.
+   */
+  protected function renderDate($timestamp) {
+    return $this->dateFormatter->format($timestamp, 'short');
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/Field/FieldType/SchedulerRepeaterItem.php b/scheduler_repeat/src/Plugin/Field/FieldType/SchedulerRepeaterItem.php
new file mode 100644
index 000000000..863fbe9d2
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/Field/FieldType/SchedulerRepeaterItem.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\Field\FieldType;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\TypedData\DataDefinition;
+
+/**
+ * Provides a Scheduler Repeat field type.
+ *
+ * @FieldType(
+ *   id = "scheduler_repeater",
+ *   label = @Translation("Scheduler Repeater"),
+ *   default_formatter = "scheduler_repeater_formatter",
+ *   default_widget = "scheduler_repeater_widget",
+ * )
+ */
+class SchedulerRepeaterItem extends FieldItemBase implements FieldItemInterface {
+
+  const COLUMN_PLUGIN_MAX_LENGTH = 255;
+  const COLUMN_TIMESTAMP_MAX_LENGTH = 20;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    $properties['plugin'] = DataDefinition::create('string')
+      ->setLabel('Repeat')
+      ->setDescription('Specifies the plugin and optionla data to be used for calculating the repeat schedule.');
+    $properties['next_publish_on'] = DataDefinition::create('timestamp')
+      ->setLabel('Next publish on')
+      ->setDescription('The calculated next date and time for scheduled publishing.');
+    $properties['next_unpublish_on'] = DataDefinition::create('timestamp')
+      ->setLabel('Next unpublish on')
+      ->setDescription('The calculated next date and time for scheduled unpublishing.');
+
+    return $properties;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isEmpty() {
+    $plugin = $this->get('plugin')->getValue();
+    return $plugin === NULL || $plugin === '' || $plugin === 'none';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConstraints() {
+    $constraints = parent::getConstraints();
+
+    $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'plugin' => [
+        'Length' => [
+          'max' => self::COLUMN_PLUGIN_MAX_LENGTH,
+          'maxMessage' => $this->t('%name: may not be longer than @max characters.', [
+            '%name' => $this->getFieldDefinition()->getLabel(),
+            '@max' => self::COLUMN_PLUGIN_MAX_LENGTH,
+          ]),
+        ],
+      ],
+      'next_publish_on' => [
+        'Length' => [
+          'max' => self::COLUMN_TIMESTAMP_MAX_LENGTH,
+          'maxMessage' => $this->t('%name: may not be longer than @max characters.', [
+            '%name' => $this->getFieldDefinition()->getLabel(),
+            '@max' => self::COLUMN_TIMESTAMP_MAX_LENGTH,
+          ]),
+        ],
+      ],
+      'next_unpublish_on' => [
+        'Length' => [
+          'max' => self::COLUMN_TIMESTAMP_MAX_LENGTH,
+          'maxMessage' => $this->t('%name: may not be longer than @max characters.', [
+            '%name' => $this->getFieldDefinition()->getLabel(),
+            '@max' => self::COLUMN_TIMESTAMP_MAX_LENGTH,
+          ]),
+        ],
+      ],
+    ]);
+
+    return $constraints;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
+    $options = [
+      'hourly' => 'Hourly',
+      'daily' => 'Daily',
+      'weekly' => 'Weekly',
+      'monthly' => 'Monthly',
+      'yearly' => 'Yearly',
+    ];
+    $values['plugin'] = array_rand($options);
+    $values['next_publish_on'] = rand(strtotime("+1 day"), strtotime("+3 days"));
+    // @todo Change unpublish time when we have more $options.
+    $values['next_unpublish_on'] = $values['next_publish_on'] + rand(1, 3600);
+    return $values;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    // Can alter this list to allow uninstall of old column names.
+    return [
+      'columns' => [
+        'plugin' => [
+          'type' => 'varchar',
+          'length' => self::COLUMN_PLUGIN_MAX_LENGTH,
+        ],
+        'next_publish_on' => [
+          'type' => 'int',
+        ],
+        'next_unpublish_on' => [
+          'type' => 'int',
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/Field/FieldWidget/SchedulerRepeaterWidget.php b/scheduler_repeat/src/Plugin/Field/FieldWidget/SchedulerRepeaterWidget.php
new file mode 100644
index 000000000..041267711
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/Field/FieldWidget/SchedulerRepeaterWidget.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\WidgetBase;
+use Drupal\Core\Field\WidgetInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Plugin implementation of the 'options_select' widget.
+ *
+ * @FieldWidget(
+ *   id = "scheduler_repeater_widget",
+ *   label = @Translation("Scheduler Repeat option list"),
+ *   field_types = {
+ *     "scheduler_repeater"
+ *   }
+ * )
+ */
+class SchedulerRepeaterWidget extends WidgetBase implements WidgetInterface {
+
+  /**
+   * The Scheduler Repeat plugin manager.
+   *
+   * @var \Drupal\scheduler_repeat\SchedulerRepeaterManager
+   */
+  protected $pluginManager;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(ContainerInterface $container, $plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings) {
+    $this->pluginManager = $container->get('plugin.manager.scheduler_repeat.repeater');
+    $this->dateFormatter = $container->get('date.formatter');
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($container, $plugin_id, $plugin_definition, $configuration['field_definition'], $configuration['settings'], $configuration['third_party_settings']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $formElement = [
+      'plugin' => [
+        '#title' => $this->t('Repeat schedule'),
+        '#type' => 'select',
+        '#default_value' => isset($items->get($delta)->plugin) ? $items->get($delta)->plugin : NULL,
+        '#options' => $this->getRepeaterOptions(),
+        '#empty_option' => $this->t('None'),
+        '#empty_value' => 'none',
+      ],
+      'next_publish_on' => $this->addNextDateElement($this->t('Next publish on'), $items->get($delta)->next_publish_on),
+      'next_unpublish_on' => $this->addNextDateElement($this->t('Next unpublish on'), $items->get($delta)->next_unpublish_on),
+    ] + $element;
+    return $formElement;
+  }
+
+  /**
+   * Add a read-only form item to store and display the next date.
+   *
+   * @param Drupal\Core\StringTranslation\TranslatableMarkup $title
+   *   The title of the date item.
+   * @param int $value
+   *   The date value, which may be empty.
+   *
+   * @return array
+   *   A form element displaying the next date.
+   */
+  protected function addNextDateElement(TranslatableMarkup $title, $value) {
+    // Create the element, even if the next date value is empty.
+    $element = [
+      '#type' => 'item',
+      '#value' => $value,
+    ];
+
+    // If there is a value, display the title and the formatted value.
+    if ($value) {
+      $element['#title'] = $title;
+      $element['#markup'] = $this->dateFormatter->format($value);
+    }
+
+    return $element;
+  }
+
+  /**
+   * Get all Scheduler Repeat options.
+   *
+   * @return array
+   *   An array of repeat options, for use in form selection element.
+   */
+  protected function getRepeaterOptions() {
+    $plugin_definitions = $this->pluginManager->getDefinitions();
+    // @todo Make the sorting more robust. If a plugin does not have 'weight' we
+    // get error "array_multisort(): Array sizes are inconsistent".
+    array_multisort(array_column($plugin_definitions, 'weight'), SORT_ASC, $plugin_definitions);
+    $options = [];
+    foreach ($plugin_definitions as $plugin_id => $plugin) {
+      /** @var \Drupal\Core\StringTranslation\TranslatableMarkup $label */
+      $label = $plugin['label'];
+      $options[$plugin_id] = $label->render();
+    }
+    return $options;
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/Daily.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/Daily.php
new file mode 100644
index 000000000..981cc25bd
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/Daily.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every day.
+ *
+ * @SchedulerRepeater(
+ *   id = "daily",
+ *   label = @Translation("Daily"),
+ *   weight = 2
+ * )
+ */
+class Daily extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+1 day", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+1 day", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/Hourly.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/Hourly.php
new file mode 100644
index 000000000..c466276bd
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/Hourly.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every hour.
+ *
+ * @SchedulerRepeater(
+ *   id = "hourly",
+ *   label = @Translation("Hourly"),
+ *   weight = 1
+ * )
+ */
+class Hourly extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+1 hour", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+1 hour", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/Monthly.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/Monthly.php
new file mode 100644
index 000000000..00e47bcbd
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/Monthly.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every month.
+ *
+ * @SchedulerRepeater(
+ *   id = "monthly",
+ *   label = @Translation("Monthly"),
+ *   weight = 4
+ * )
+ */
+class Monthly extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+1 month", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+1 month", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/SchedulerRepeaterBase.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/SchedulerRepeaterBase.php
new file mode 100644
index 000000000..f32c91e8c
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/SchedulerRepeaterBase.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\node\NodeInterface;
+use Drupal\scheduler_repeat\MissingOptionNodeException;
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Base class for the repeat plugins to extend from.
+ */
+abstract class SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * Holds the node that is being repeated.
+   *
+   * @var \Drupal\node\NodeInterface
+   */
+  protected $node;
+
+  /**
+   * Constructor.
+   *
+   * @param array $options
+   *   ? how to describe this parameter? What can be included in it?.
+   *
+   * @throws \Drupal\scheduler_repeat\MissingOptionNodeException
+   */
+  public function __construct(array $options) {
+    if (empty($options['node']) || !$options['node'] instanceof NodeInterface) {
+      throw new MissingOptionNodeException('Repeater ' . self::class . ' was constructed without $options[\'node\']');
+    }
+    $this->node = $options['node'];
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/SixMinutes.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/SixMinutes.php
new file mode 100644
index 000000000..d7cf2f12a
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/SixMinutes.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every six minutes.
+ *
+ * @SchedulerRepeater(
+ *   id = "sixminutes",
+ *   label = @Translation("Testing: Every 6 minutes"),
+ *   weight = 100
+ * )
+ */
+class SixMinutes extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+6 mins", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+6 mins", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/TenMinutes.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/TenMinutes.php
new file mode 100644
index 000000000..ec3626beb
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/TenMinutes.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every ten minutes.
+ *
+ * @SchedulerRepeater(
+ *   id = "tenminutes",
+ *   label = @Translation("Testing: Every 10 minutes"),
+ *   weight = 101
+ * )
+ */
+class TenMinutes extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+10 mins", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+10 mins", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/Weekly.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/Weekly.php
new file mode 100644
index 000000000..8f281eba3
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/Weekly.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every week.
+ *
+ * @SchedulerRepeater(
+ *   id = "weekly",
+ *   label = @Translation("Weekly"),
+ *   weight = 3
+ * )
+ */
+class Weekly extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+7 days", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+7 days", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/SchedulerRepeater/Yearly.php b/scheduler_repeat/src/Plugin/SchedulerRepeater/Yearly.php
new file mode 100644
index 000000000..06ca9ea5d
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/SchedulerRepeater/Yearly.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\SchedulerRepeater;
+
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+
+/**
+ * Plugin definition for schedule to repeat every year.
+ *
+ * @SchedulerRepeater(
+ *   id = "yearly",
+ *   label = @Translation("Yearly"),
+ *   weight = 5
+ * )
+ */
+class Yearly extends SchedulerRepeaterBase implements SchedulerRepeaterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextPublishedOn(int $publish_on) {
+    return strtotime("+1 year", $publish_on);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on) {
+    return strtotime("+1 year", $unpublish_on);
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraint.php b/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraint.php
new file mode 100644
index 000000000..60531783e
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraint.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\Validation\Constraint;
+
+use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
+
+/**
+ * Validates the selected scheduler_repeat value.
+ *
+ * @Constraint(
+ *   id = "SchedulerRepeat",
+ *   label = @Translation("Scheduler repeat", context = "Validation"),
+ *   type = "entity:node"
+ * )
+ */
+class SchedulerRepeatConstraint extends CompositeConstraintBase {
+
+  /**
+   * Message shown when repeat period conflicts with scheduled period.
+   *
+   * For example, you can't say "09:00-11:00 repeat every hour", because the
+   * periods would overlap.
+   *
+   * @var string
+   */
+  public $messageRepeatPeriodSmallerThanScheduledPeriod = "Repeat conflicts with 'publish on' and 'unpublish on'.";
+
+  /**
+   * {@inheritdoc}
+   */
+  public function coversFields() {
+    return ['scheduler_repeat'];
+  }
+
+}
diff --git a/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraintValidator.php b/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraintValidator.php
new file mode 100644
index 000000000..83a13c71b
--- /dev/null
+++ b/scheduler_repeat/src/Plugin/Validation/Constraint/SchedulerRepeatConstraintValidator.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Drupal\scheduler_repeat\Plugin\Validation\Constraint;
+
+use Drupal\scheduler_repeat\InvalidPluginTypeException;
+use Drupal\scheduler_repeat\SchedulerRepeaterInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * Validates the SchedulerRepeat constraint.
+ */
+class SchedulerRepeatConstraintValidator extends ConstraintValidator {
+
+  /**
+   * The Scheduler Repeat plugin manager.
+   *
+   * @var \Drupal\scheduler_repeat\SchedulerRepeaterManager
+   */
+  protected $schedulerRepeatPluginManager;
+
+  /**
+   * The node to validate.
+   *
+   * @var \Drupal\node\NodeInterface
+   */
+  protected $node;
+
+  /**
+   * The repeat plugin instance.
+   *
+   * @var \Drupal\scheduler_repeat\SchedulerRepeaterInterface
+   */
+  protected $repeater;
+
+  /**
+   * Constructs the object.
+   */
+  public function __construct() {
+    $this->schedulerRepeatPluginManager = \Drupal::service('plugin.manager.scheduler_repeat.repeater');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($value, Constraint $constraint) {
+    if ($value->isEmpty()) {
+      return;
+    }
+
+    /** @var \Drupal\node\NodeInterface $node */
+    $this->node = $value->getEntity();
+    if (!$this->shouldValidate()) {
+      return;
+    }
+
+    // @todo When associated data is added, the plugin id can be extracted.
+    $plugin_id = $value->plugin;
+
+    $this->repeater = $this->initializeRepeaterWithPlugin($plugin_id);
+    // If the calculated next publish_on value is earlier than the current
+    // unpublish_on value then the dates overlap. This means that the repeat
+    // period is too short so fail validation.
+    if ($this->repeater->calculateNextPublishedOn($this->getPublishOn()) <= $this->getUnpublishOn()) {
+      $this->context->buildViolation($constraint->messageRepeatPeriodSmallerThanScheduledPeriod)
+        ->atPath('scheduler_repeat')
+        ->addViolation();
+    }
+  }
+
+  /**
+   * Determine when validation should be applied.
+   *
+   * @return bool
+   *   Whether to validate the repeat value.
+   */
+  private function shouldValidate() {
+    // We need both dates in order to validate potentially conflicting periods.
+    // @todo Figure out how to handle $node that is in active scheduled period
+    return !$this->node->get('publish_on')->isEmpty() && !$this->node->get('unpublish_on')->isEmpty();
+  }
+
+  /**
+   * Gets publish_on date that exists in the node.
+   *
+   * @return int
+   *   The current publish_on value.
+   */
+  protected function getPublishOn() {
+    return $this->node->get('publish_on')->value;
+  }
+
+  /**
+   * Gets unpublish_on date that exists in the node.
+   *
+   * @return int
+   *   The current unpublish_on value.
+   */
+  protected function getUnpublishOn() {
+    return $this->node->get('unpublish_on')->value;
+  }
+
+  /**
+   * Create an instance of the required repeat plugin.
+   *
+   * @param string $plugin
+   *   The plugin information. Currently this is just the plugin id, but could
+   *   be expanded to hold additional associated data.
+   *
+   * @return \Drupal\scheduler_repeat\SchedulerRepeaterInterface
+   *   The repeat plugin object.
+   *
+   * @throws \Drupal\scheduler_repeat\InvalidPluginTypeException
+   *
+   * @todo This duplicates some functionality in _scheduler_repeat_get_repeater.
+   * Need to consolidate these?
+   */
+  private function initializeRepeaterWithPlugin(string $plugin) {
+    // @todo When we cater for optional associated data, the id can be
+    // extracted and the other values added into $plugin_data.
+    $plugin_id = $plugin;
+    $plugin_data = ['node' => $this->node];
+    $repeater = $this->schedulerRepeatPluginManager->createInstance($plugin_id, $plugin_data);
+    if (!$repeater instanceof SchedulerRepeaterInterface) {
+      throw new InvalidPluginTypeException('Scheduler repeater manager returned wrong plugin type: ' . get_class($repeater));
+    }
+    return $repeater;
+  }
+
+}
diff --git a/scheduler_repeat/src/SchedulerRepeaterInterface.php b/scheduler_repeat/src/SchedulerRepeaterInterface.php
new file mode 100644
index 000000000..d25149022
--- /dev/null
+++ b/scheduler_repeat/src/SchedulerRepeaterInterface.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\scheduler_repeat;
+
+/**
+ * Interface for Sheduler Repeat plugins.
+ */
+interface SchedulerRepeaterInterface {
+
+  /**
+   * SchedulerRepeaterInterface constructor.
+   *
+   * @param array $options
+   *   Array of keyed options:
+   *   - 'node': The NodeInterface which we operate on.
+   */
+  public function __construct(array $options);
+
+  /**
+   * Calculates the next occurrence of Publish On.
+   *
+   * @param int $publish_on
+   *   Timestamp from which to calculate the next publish on value.
+   *
+   * @return int
+   *   The calculated next publish_on value.
+   */
+  public function calculateNextPublishedOn(int $publish_on);
+
+  /**
+   * Calculates the next occurrence of Unpublish On.
+   *
+   * @param int $unpublish_on
+   *   Timestamp from which to calculate the next unpublish on value.
+   *
+   * @return int
+   *   The calculated next unpublish_on value.
+   */
+  public function calculateNextUnpublishedOn(int $unpublish_on);
+
+}
diff --git a/scheduler_repeat/src/SchedulerRepeaterManager.php b/scheduler_repeat/src/SchedulerRepeaterManager.php
new file mode 100644
index 000000000..ddfd93d9e
--- /dev/null
+++ b/scheduler_repeat/src/SchedulerRepeaterManager.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\scheduler_repeat;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\scheduler_repeat\Annotation\SchedulerRepeater;
+
+/**
+ * Plugin type manager for scheduler repeat plugin options.
+ *
+ * @ingroup scheduler_repeat
+ */
+class SchedulerRepeaterManager extends DefaultPluginManager {
+
+  /**
+   * Constructs a SchedulerRepeatManager object.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   Needed by DefaultPluginManager for hooks.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
+    parent::__construct('Plugin/SchedulerRepeater', $namespaces, $module_handler, SchedulerRepeaterInterface::class, SchedulerRepeater::class);
+    $this->setCacheBackend($cache_backend, 'scheduler_repeat');
+  }
+
+}
diff --git a/scheduler_repeat/tests/src/Functional/SchedulerRepeatCalculationsTest.php b/scheduler_repeat/tests/src/Functional/SchedulerRepeatCalculationsTest.php
new file mode 100644
index 000000000..aa539cef5
--- /dev/null
+++ b/scheduler_repeat/tests/src/Functional/SchedulerRepeatCalculationsTest.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Drupal\Tests\scheduler\Functional;
+
+/**
+ * Tests the repeat calculations on node creation, edit and during cron.
+ *
+ * @group scheduler
+ */
+class SchedulerRepeatCalculationsTest extends SchedulerBrowserTestBase {
+
+  /**
+   * Additional modules required.
+   *
+   * @var array
+   */
+  protected static $modules = ['scheduler_repeat'];
+
+  /**
+   * Tests that the next dates are calculated during node creation and editing.
+   *
+   * @dataProvider dataRepeatPlugins()
+   */
+  public function testRepeatCreateEdit($plugin, $calculation) {
+    $this->drupalLogin($this->adminUser);
+
+    // Create a node with a repeating schedule.
+    $options = [
+      'type' => $this->type,
+      'title' => 'Repeat ' . $plugin,
+      'status' => FALSE,
+      'publish_on' => strtotime('+15 mins', $this->requestTime),
+      'unpublish_on' => strtotime('+30 mins', $this->requestTime),
+      'scheduler_repeat' => ['plugin' => $plugin],
+    ];
+    $node = $this->drupalCreateNode($options);
+    $nid = $node->id();
+
+    // Check that the initial next dates have been created correctly.
+    $expected_next_publish = strtotime($calculation, $options['publish_on']);
+    $expected_next_unpublish = strtotime($calculation, $options['unpublish_on']);
+    $this->assertEquals($expected_next_publish, $node->get('scheduler_repeat')->next_publish_on);
+    $this->assertEquals($expected_next_unpublish, $node->get('scheduler_repeat')->next_unpublish_on);
+
+    // Edit and save.
+    $editted_publish_on = strtotime('+20 mins', $this->requestTime);
+    $editted_unpublish_on = strtotime('+45 mins', $this->requestTime);
+    $edit = [
+      'body[0][value]' => "plugin = $plugin\nncalculation = $calculation",
+      'publish_on[0][value][date]' => date('Y-m-d', $editted_publish_on),
+      'publish_on[0][value][time]' => date('H:i:s', $editted_publish_on),
+      'unpublish_on[0][value][date]' => date('Y-m-d', $editted_unpublish_on),
+      'unpublish_on[0][value][time]' => date('H:i:s', $editted_unpublish_on),
+    ];
+    $this->drupalPostForm('node/' . $nid . '/edit', $edit, 'Save');
+
+    // Reload the node.
+    $node = $this->nodeStorage->load($nid);
+
+    // Check that the updated next dates have been created correctly.
+    $expected_next_publish = strtotime($calculation, $editted_publish_on);
+    $expected_next_unpublish = strtotime($calculation, $editted_unpublish_on);
+    $this->assertEquals($expected_next_publish, $node->get('scheduler_repeat')->next_publish_on);
+    $this->assertEquals($expected_next_unpublish, $node->get('scheduler_repeat')->next_unpublish_on);
+  }
+
+  /**
+   * Tests that the next dates are calculated after unpublishing via cron.
+   *
+   * @dataProvider dataRepeatPlugins()
+   */
+  public function testRepeatCron($plugin, $calculation) {
+    $this->drupalLogin($this->adminUser);
+
+    // Allow publishing dates in the past, so they can be processed by cron
+    // without waiting.
+    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
+
+    // Create a node with a repeating schedule.
+    $options = [
+      'type' => $this->type,
+      'title' => 'Repeat ' . $plugin,
+      'status' => FALSE,
+      'publish_on' => strtotime('-30 mins', $this->requestTime),
+      'unpublish_on' => strtotime('-10 mins', $this->requestTime),
+      'scheduler_repeat' => ['plugin' => $plugin],
+    ];
+    $node = $this->drupalCreateNode($options);
+    $nid = $node->id();
+
+    // Call the main scheduler function that executed during a cron run, then
+    // reset the cache and reload the node.
+    scheduler_cron();
+    $this->nodeStorage->resetCache([$nid]);
+    $node = $this->nodeStorage->load($nid);
+
+    // Check that the node has been re-scheduled for the next dates.
+    $expected_publish = strtotime($calculation, $options['publish_on']);
+    $expected_unpublish = strtotime($calculation, $options['unpublish_on']);
+    $this->assertEquals($expected_publish, $node->publish_on->value);
+    $this->assertEquals($expected_unpublish, $node->unpublish_on->value);
+
+    // Check that the node has been re-scheduled for the next dates.
+    $expected_next_publish = strtotime($calculation, $expected_publish);
+    $expected_next_unpublish = strtotime($calculation, $expected_unpublish);
+    $this->assertEquals($expected_next_publish, $node->get('scheduler_repeat')->next_publish_on);
+    $this->assertEquals($expected_next_unpublish, $node->get('scheduler_repeat')->next_unpublish_on);
+  }
+
+  /**
+   * Provides data for testRepeatCreateEdit() and testRepeatCron().
+   *
+   * @return array
+   *   This is a nested array. The top-level keys are not available in the test
+   *   so can be anything, but we use the plugin id for clarity. Each value is
+   *   an associative array with the following key-value pairs:
+   *     plugin             - the plugin id
+   *     calculation        - a string to use in strToTime() calculation.
+   */
+  public function dataRepeatPlugins() {
+
+    $data = [
+      'hourly' => [
+        'plugin' => 'hourly',
+        'calculation' => '+60 mins',
+      ],
+      'daily' => [
+        'plugin' => 'daily',
+        'calculation' => '+24 hours',
+      ],
+      'weekly' => [
+        'plugin' => 'weekly',
+        'calculation' => '+7 days',
+      ],
+      'monthly' => [
+        'plugin' => 'monthly',
+        'calculation' => '+1 month',
+      ],
+      'yearly' => [
+        'plugin' => 'yearly',
+        'calculation' => '+12 months',
+      ],
+    ];
+
+    // Use unset($data[x]) to remove a temporarily unwanted item, use
+    // return [$data[x], $data[y]] to selectively test just some items, or have
+    // the default return $data to test everything.
+    return $data;
+  }
+
+}
diff --git a/scheduler_repeat/tests/src/Functional/SchedulerRepeatFormTest.php b/scheduler_repeat/tests/src/Functional/SchedulerRepeatFormTest.php
new file mode 100644
index 000000000..a514b4204
--- /dev/null
+++ b/scheduler_repeat/tests/src/Functional/SchedulerRepeatFormTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Drupal\Tests\scheduler\Functional;
+
+/**
+ * Tests that repeat widget is being enabled along with scheduled date fields.
+ *
+ * @group scheduler
+ */
+class SchedulerRepeatFormTest extends SchedulerBrowserTestBase {
+
+  /**
+   * Additional modules required.
+   *
+   * @var array
+   */
+  protected static $modules = ['scheduler_repeat', 'field_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp(): void {
+    parent::setUp();
+
+    // Create node type that only has scheduled publishing enabled.
+    $this->onlyPublishOnNodetype = $this->drupalCreateContentType([
+      'type' => 'only_publish_hon_nodetype',
+      'name' => 'Only publish on nodetype',
+    ]);
+    $this->onlyPublishOnNodetype->setThirdPartySetting('scheduler', 'publish_enable', TRUE)
+      ->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)
+      ->save();
+
+    // Create node type that only has scheduled unpublishing enabled.
+    $this->onlyUnpublishOnNodetype = $this->drupalCreateContentType([
+      'type' => 'only_unpublish_hon_nodetype',
+      'name' => 'Only unpublish on nodetype',
+    ]);
+    $this->onlyUnpublishOnNodetype->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
+      ->setThirdPartySetting('scheduler', 'unpublish_enable', TRUE)
+      ->save();
+
+  }
+
+  /**
+   * Tests that the repeat input is displayed correctly in the node edit form.
+   *
+   * This tests covers scheduler_repeat_form_node_form_alter().
+   */
+  public function testRepeatNodeForm() {
+    $this->drupalLogin($this->adminUser);
+
+    /** @var \Drupal\Tests\WebAssert $assert */
+    $assert = $this->assertSession();
+
+    // Check that repeat selection is shown in the vertical tab.
+    $this->drupalGet('node/add/' . $this->type);
+    $assert->elementExists('xpath', '//div[contains(@class, "form-type-vertical-tabs")]//details[@id = "edit-scheduler-settings"]//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+    // Check that repeat selection is shown in the fieldset.
+    $this->nodetype->setThirdPartySetting('scheduler', 'fields_display_mode', 'fieldset')->save();
+    $this->drupalGet('node/add/' . $this->type);
+    $assert->elementExists('xpath', '//details[@id = "edit-scheduler-settings"]//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+    // Check that repeat selection is shown also when editing node.
+    $options = [
+      'title' => 'Contains scheduled dates ' . $this->randomMachineName(10),
+      'type' => $this->type,
+      'publish_on' => strtotime('+1 day'),
+      'unpublish_on' => strtotime('+2 day'),
+    ];
+    $node = $this->drupalCreateNode($options);
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $assert->elementExists('xpath', '//details[@id = "edit-scheduler-settings"]//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+    // Check that repeat selection is not shown when no scheduling is enabled.
+    $this->drupalGet('node/add/' . $this->nonSchedulerNodeType->id());
+    $assert->elementNotExists('xpath', '//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+    // Check that repeat selection is not shown if publishing is not enabled.
+    $this->drupalGet('node/add/' . $this->onlyPublishOnNodetype->id());
+    $assert->elementNotExists('xpath', '//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+    // Check that repeat selection is not shown if unpublishing is not enabled.
+    $this->drupalGet('node/add/' . $this->onlyUnpublishOnNodetype->id());
+    $assert->elementNotExists('xpath', '//div[@id = "edit-scheduler-repeat-wrapper"]');
+
+  }
+
+  /**
+   * Tests the settings entry in the content type form display.
+   *
+   * This test covers scheduler_repeat_entity_base_field_info().
+   */
+  public function testRepeatManageFormDisplay() {
+    // Create a custom user with admin permissions but also permission to use
+    // the field_ui module 'node form display' tab.
+    $this->adminUser2 = $this->drupalCreateUser([
+      'access content',
+      'administer content types',
+      'administer node form display',
+    ]);
+    $this->drupalLogin($this->adminUser2);
+
+    // Check that the weight input field is displayed when the content type is
+    // enabled for scheduling. This field still exists even with tabledrag on.
+    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
+    $this->assertSession()->fieldExists('edit-fields-scheduler-repeat-weight');
+
+    // Disabling scheduled publishing and unpublishing has no effect on whether
+    // the base fields are displayed in the form. This is the same for the main
+    // Scheduler fields.
+  }
+
+}