12468: Sort by Price not working on CatalogSearch Page in Magento 2

Author: omiroshnichenko

app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

@@ -689,7 +689,7 @@ public function getWidgetOptionsJson(array $customOptions = [])
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
             'modeDefault' => $defaultMode,
             'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
-            'orderDefault' => $this->_productListHelper->getDefaultSortField(),
+            'orderDefault' => $this->getOrderField(),
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
         ];

app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js

@@ -78,7 +78,6 @@ define([
             );
         },
 
-        /*eslint-disable no-unused-vars*/
         /**
          * @param {String} paramName
          * @param {*} paramValue
@@ -100,13 +99,14 @@ define([
             }
             paramData[paramName] = paramValue;
 
+            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
+                delete paramData[paramName];
+            }
             paramData = $.param(paramData);
 
             location.href = baseUrl + (paramData.length ? '?' + paramData : '');
         }
     });
 
-    /*eslint-enable no-unused-vars*/
-
     return $.mage.productListToolbarForm;
 });