Issue #2769825 by AndyF, claudiu.cristea, alexpott: Cannot swap tabledrag rows... (5b9cb9b7) · Commits · project / drupal

core/misc/tabledrag.es6.js

+6 −2

Original line number	Diff line number	Diff line
		@@ -111,9 +111,9 @@
		/**
		* Used to determine up or down direction from last mouse move.
		*
		* @type {number}
		* @type {?number}
		*/
		this.oldY = 0;
		this.oldY = null;

		/**
		* Whether anything in the entire table has changed.
		@@ -760,6 +760,10 @@
		if (self.oldRowElement) {
		$(self.oldRowElement).removeClass('drag-previous');
		}

		// Set the initial y coordinate so the direction can be calculated in
		// dragRow().
		self.oldY = self.pointerCoords(event).y;
		};

		/**

core/misc/tabledrag.js

+3 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol

		this.oldRowElement = null;

		this.oldY = 0;
		this.oldY = null;

		this.changed = false;

		@@ -417,6 +417,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
		if (self.oldRowElement) {
		$(self.oldRowElement).removeClass('drag-previous');
		}

		self.oldY = self.pointerCoords(event).y;
		};

		Drupal.tableDrag.prototype.dragRow = function (event, self) {

core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php

+123 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Drupal\FunctionalJavascriptTests\TableDrag;

		use Behat\Mink\Element\NodeElement;
		use Behat\Mink\Exception\ExpectationException;
		use Drupal\FunctionalJavascriptTests\WebDriverTestBase;

		/**
		@@ -43,6 +44,88 @@ protected function setUp() {
		$this->state = $this->container->get('state');
		}

		/**
		* Tests row weight switch.
		*/
		public function testRowWeightSwitch() {
		$this->state->set('tabledrag_test_table', array_flip(range(1, 3)));

		$this->drupalGet('tabledrag_test');

		$session = $this->getSession();
		$page = $session->getPage();

		$weight_select1 = $page->findField("table[1][weight]");
		$weight_select2 = $page->findField("table[2][weight]");
		$weight_select3 = $page->findField("table[3][weight]");

		// Check that rows weight selects are hidden.
		$this->assertFalse($weight_select1->isVisible());
		$this->assertFalse($weight_select2->isVisible());
		$this->assertFalse($weight_select3->isVisible());

		// Toggle row weight selects as visible.
		$this->findWeightsToggle('Show row weights')->click();

		// Check that rows weight selects are visible.
		$this->assertTrue($weight_select1->isVisible());
		$this->assertTrue($weight_select2->isVisible());
		$this->assertTrue($weight_select3->isVisible());

		// Toggle row weight selects back to hidden.
		$this->findWeightsToggle('Hide row weights')->click();

		// Check that rows weight selects are hidden again.
		$this->assertFalse($weight_select1->isVisible());
		$this->assertFalse($weight_select2->isVisible());
		$this->assertFalse($weight_select3->isVisible());
		}

		/**
		* Tests draggable table drag'n'drop.
		*/
		public function testDragAndDrop() {
		$this->state->set('tabledrag_test_table', array_flip(range(1, 3)));
		$this->drupalGet('tabledrag_test');

		$session = $this->getSession();
		$page = $session->getPage();

		$weight_select1 = $page->findField("table[1][weight]");
		$weight_select2 = $page->findField("table[2][weight]");
		$weight_select3 = $page->findField("table[3][weight]");

		// Check that initially the rows are in the correct order.
		$this->assertOrder(['Row with id 1', 'Row with id 2', 'Row with id 3']);

		// Check that the 'unsaved changes' text is not present in the message area.
		$this->assertSession()->pageTextNotContains('You have unsaved changes.');

		$row1 = $this->findRowById(1)->find('css', 'a.tabledrag-handle');
		$row2 = $this->findRowById(2)->find('css', 'a.tabledrag-handle');
		$row3 = $this->findRowById(3)->find('css', 'a.tabledrag-handle');

		// Drag row1 over row2.
		$row1->dragTo($row2);

		// Check that the 'unsaved changes' text was added in the message area.
		$this->assertSession()->waitForText('You have unsaved changes.');

		// Check that row1 and row2 were swapped.
		$this->assertOrder(['Row with id 2', 'Row with id 1', 'Row with id 3']);

		// Check that weights were changed.
		$this->assertGreaterThan($weight_select2->getValue(), $weight_select1->getValue());
		$this->assertGreaterThan($weight_select2->getValue(), $weight_select3->getValue());
		$this->assertGreaterThan($weight_select1->getValue(), $weight_select3->getValue());

		// Now move the last row (row3) in the second position. row1 should go last.
		$row3->dragTo($row1);

		// Check that the order is: row2, row3 and row1.
		$this->assertOrder(['Row with id 2', 'Row with id 3', 'Row with id 1']);
		}

		/**
		* Tests accessibility through keyboard of the tabledrag functionality.
		*/
		@@ -199,6 +282,31 @@ public function testTableDragChangedWarning() {
		$this->assertSession()->pageTextContainsOnce('You have unsaved changes.');
		}

		/**
		* Asserts that several pieces of markup are in a given order in the page.
		*
		* @param string[] $items
		* An ordered list of strings.
		*
		* @throws \Behat\Mink\Exception\ExpectationException
		* When any of the given string is not found.
		*
		* @todo Remove this and use the WebAssert method when #2817657 is done.
		*/
		protected function assertOrder(array $items) {
		$session = $this->getSession();
		$text = $session->getPage()->getHtml();
		$strings = [];
		foreach ($items as $item) {
		if (($pos = strpos($text, $item)) === FALSE) {
		throw new ExpectationException("Cannot find '$item' in the page", $session->getDriver());
		}
		$strings[$pos] = $item;
		}
		ksort($strings);
		$this->assertSame($items, array_values($strings), "Strings found on the page but incorrectly ordered.");
		}

		/**
		* Asserts the whole structure of the draggable test table.
		*
		@@ -262,6 +370,21 @@ protected function findRowById($id) {
		return $row;
		}

		/**
		* Finds the show/hide weight toggle element.
		*
		* @param string $expected_text
		* The expected text on the element.
		*
		* @return \Behat\Mink\Element\NodeElement
		* The toggle element.
		*/
		protected function findWeightsToggle($expected_text) {
		$toggle = $this->getSession()->getPage()->findButton($expected_text);
		$this->assertNotEmpty($toggle);
		return $toggle;
		}

		/**
		* Moves a row through the keyboard.
		*

core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroTableDragTest.php

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\FunctionalJavascriptTests\Theme;

		use Drupal\FunctionalJavascriptTests\TableDrag\TableDragTest;

		/**
		* Runs TableDragTest in Claro.
		*
		* @group claro
		*
		* @see \Drupal\FunctionalJavascriptTests\TableDrag\TableDragTest
		*/
		class ClaroTableDragTest extends TableDragTest {

		/**
		* {@inheritdoc}
		*/
		protected $defaultTheme = 'claro';

		/**
		* {@inheritdoc}
		*/
		protected function findWeightsToggle($expected_text) {
		$toggle = $this->getSession()->getPage()->findLink($expected_text);
		$this->assertNotEmpty($toggle);
		return $toggle;
		}

		}

core/themes/claro/js/tabledrag.es6.js

+6 −2

Original line number	Diff line number	Diff line
		@@ -146,9 +146,9 @@
		/**
		* Used to determine up or down direction from last mouse move.
		*
		* @type {number}
		* @type {?number}
		*/
		this.oldY = 0;
		this.oldY = null;

		/**
		* Whether anything in the entire table has changed.
		@@ -856,6 +856,10 @@
		if (self.oldRowElement) {
		$(self.oldRowElement).removeClass('drag-previous');
		}

		// Set the initial y coordinate so the direction can be calculated in
		// dragRow().
		self.oldY = self.pointerCoords(event).y;
		},

		/**